Merge lp:~canonical-platform-qa/ubuntu-system-tests/yakkety-build-pkg into lp:ubuntu-system-tests

Proposed by Richard Huddie
Status: Merged
Approved by: Allan LeSage
Approved revision: 448
Merged at revision: 447
Proposed branch: lp:~canonical-platform-qa/ubuntu-system-tests/yakkety-build-pkg
Merge into: lp:ubuntu-system-tests
Diff against target: 20 lines (+4/-1)
2 files modified
debian/rules (+1/-1)
debian/tests/control (+3/-0)
To merge this branch: bzr merge lp:~canonical-platform-qa/ubuntu-system-tests/yakkety-build-pkg
Reviewer Review Type Date Requested Status
Allan LeSage (community) Approve
platform-qa-bot continuous-integration Approve
Review via email: mp+304618@code.launchpad.net

Commit message

Fix packaging error on yakkety which is stopping ppa publishing from working.

Description of the change

Fixes the flake8 command which was previously failing with: No module named flake8.run.

See a full failure log here: https://launchpadlibrarian.net/282084792/buildlog_ubuntu-yakkety-amd64.ubuntu-system-tests_1.0-0~446~ubuntu16.10.1_BUILDING.txt.gz

This branch has been tested with vivid, wily, xenial and yakkety builds and all work fine. See the results here: https://code.launchpad.net/~rhuddie/+archive/ubuntu/ust/+packages

Also fixes building a package using: bzr builddeb -- -us -uc.

This was previously failing because the debian/tests/control file was missing, now replaced with dummy version. Another control file is generated dynamically when running tests for real.

This can be tested by running command and ensuring package builds ok: bzr builddeb -- -us -uc

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
448. By Richard Huddie

Add dummy debian/tests/control file.

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Confirmed fixed given available evidence, also ran a bzr builddeb locally.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2016-07-08 11:36:12 +0000
3+++ debian/rules 2016-09-01 12:00:54 +0000
4@@ -8,7 +8,7 @@
5 dh $@ --with python3 --buildsystem=pybuild
6
7 override_dh_auto_build:
8- python3 -m flake8.run --max-complexity 6 .
9+ python3 -m flake8 --max-complexity 6 .
10 dh_auto_build
11
12 override_dh_auto_test:
13
14=== added file 'debian/tests/control'
15--- debian/tests/control 1970-01-01 00:00:00 +0000
16+++ debian/tests/control 2016-09-01 12:00:54 +0000
17@@ -0,0 +1,3 @@
18+# Dummy control file.
19+# ubuntu-system-tests uses a dynamically generated debian/tests/control file.
20+# This file is added to ensure package builds correctly using bzr builddeb.

Subscribers

People subscribed via source and target branches

to all changes: