Merge lp:~sil2100/autopilot/u-a-l-2_nbs_removal into lp:autopilot

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Richard Huddie
Approved revision: 594
Merged at revision: 595
Proposed branch: lp:~sil2100/autopilot/u-a-l-2_nbs_removal
Merge into: lp:autopilot
Diff against target: 21 lines (+2/-2)
1 file modified
debian/control (+2/-2)
To merge this branch: bzr merge lp:~sil2100/autopilot/u-a-l-2_nbs_removal
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
Santiago Baldassin (community) Approve
Richard Huddie (community) Approve
Review via email: mp+321562@code.launchpad.net

Commit message

Get rid of the conditional dependency of gir1.2-ubuntu-app-launch-2 - it's no longer built from any source.

Description of the change

Get rid of the conditional dependency of gir1.2-ubuntu-app-launch-2 - it's no longer built from any source.

To post a comment you must log in.
Revision history for this message
Richard Huddie (rhuddie) wrote :

Looks good to me

review: Approve
Revision history for this message
Santiago Baldassin (sbaldassin) :
review: Approve
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

The tests are failing as they're being run against the xenial main archive. Xenial has an obsolete ubuntu-app-launch version that still uses the old ABI package - the xenial-overlay has the latest one.

Are there any reasons why the tests still run against xenial instead of zesty? I suppose that trunk == latest development release, so we should be using zesty for running tests. Especially that we want to get rid of gir1.2-ubuntu-app-launch-2 from that series.

Revision history for this message
Richard Huddie (rhuddie) wrote :

We're working on making the ci update to zesty now.

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Max Brustkern (nuclearbob) wrote :

The package build are on zesty, but there are still some failures

Revision history for this message
Max Brustkern (nuclearbob) wrote :

This is what's showing on i386:
   debian/rules override_dh_auto_test
make[1]: Entering directory '/build/autopilot-1.6.0+16.10.20160818.1'
HOME=`mktemp -d --tmpdir=debian` \
XDG_RUNTIME_DIR=`mktemp -d --tmpdir=debian` \
python3 -m testtools.run discover autopilot.tests.unit
/usr/lib/python3.5/runpy.py:125: RuntimeWarning: 'testtools.run' found in sys.modules after import of package 'testtools', but prior to execution of 'testtools.run'; this may result in unpredictable behaviour
  warn(RuntimeWarning(msg))

terminate called after throwing an instance of 'std::runtime_error'
  what(): Unable to connect to user bus: Cannot autolaunch D-Bus without X11 $DISPLAY
Aborted (core dumped)
debian/rules:23: recipe for target 'override_dh_auto_test' failed
make[1]: *** [override_dh_auto_test] Error 134
make[1]: Leaving directory '/build/autopilot-1.6.0+16.10.20160818.1'
debian/rules:8: recipe for target 'build' failed
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

The build failure is unrelated to this change, I think we need to poke around as something in zesty broke the build. I checked this by performing a no-change rebuild of autopilot in a PPA and got the same build failure.

Eh, bad luck...

Revision history for this message
Łukasz Zemczak (sil2100) wrote :
Revision history for this message
Richard Huddie (rhuddie) wrote :

I now have a separate mp to fix the zesty package building here: https://code.launchpad.net/~canonical-platform-qa/autopilot/fix-zesty-build/+merge/321891

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-03-02 18:35:59 +0000
3+++ debian/control 2017-03-31 13:24:03 +0000
4@@ -8,7 +8,7 @@
5 dvipng,
6 gir1.2-gtk-3.0,
7 gir1.2-ibus-1.0,
8- gir1.2-ubuntu-app-launch-3 | gir1.2-ubuntu-app-launch-2,
9+ gir1.2-ubuntu-app-launch-3,
10 graphviz,
11 libjs-jquery,
12 libjs-underscore,
13@@ -44,7 +44,7 @@
14
15 Package: python3-autopilot
16 Architecture: all
17-Depends: gir1.2-ubuntu-app-launch-3 | gir1.2-ubuntu-app-launch-2,
18+Depends: gir1.2-ubuntu-app-launch-3,
19 libjs-jquery,
20 libjs-underscore,
21 mir-utils,

Subscribers

People subscribed via source and target branches