Unity 8

Merge lp:~cimi/unity8/unity8.upstart_unity-mir_variables into lp:unity8

  1. unity8.upstart_unity-mir_variables
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 829
Merged at revision: 863
Proposed branch: lp:~cimi/unity8/unity8.upstart_unity-mir_variables
Merge into: lp:unity8
Diff against target: 71 lines (+18/-3)
4 files modified
data/unity8.conf (+8/-0)
debian/changelog (+7/-0)
debian/control (+1/-1)
tests/autopilot/unity8/shell/tests/test_upstart.py (+2/-2)
To merge this branch: bzr merge lp:~cimi/unity8/unity8.upstart_unity-mir_variables
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+215152@code.launchpad.net

Commit message

Uses UNITY_MIR_EMITS_SIGSTOP according to https://code.launchpad.net/~cimi/unity-mir/unity-mir.stop-server_wizard
Cleans also MIR env vars after stopping the upstart job

Description of the change

Uses UNITY_MIR_EMITS_SIGSTOP according to https://code.launchpad.net/~cimi/unity-mir/unity-mir.stop-server_wizard

Cleans also MIR env vars after stopping the upstart job

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~cimi/unity-mir/unity-mir.stop-server_wizard
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/unity8-ci/2793/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/175
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1318
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5895
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4092
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4868
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4868/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2793/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:826
http://jenkins.qa.ubuntu.com/job/unity8-ci/2794/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/179
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4746
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1319
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1315
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5901
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4875
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4875/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2794/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:826
http://jenkins.qa.ubuntu.com/job/unity8-ci/2806/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/221
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4811
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1331
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1327
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5989
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4943
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4943/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2806/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:828
http://jenkins.qa.ubuntu.com/job/unity8-ci/2830/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4879
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1355
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1351
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4457
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6099
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5022/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2830/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:829
http://jenkins.qa.ubuntu.com/job/unity8-ci/2844/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/307
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4922/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1369
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1369/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1365
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6159
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4252/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5075
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5075/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2844/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

Tested again with the ci builds on my mako, and the autopilot tests are not failing

Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Otto broken, and the modified tests require the corresponding unity-mir MP.

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

http://people.canonical.com/~msawicz/unity8/strip-u8-tags.sh please.

review: Needs Fixing
Revision history for this message
Albert Astals Cid (aacid) wrote :

tags have been cleared, re-top approving based on previous Michał's comments

Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

We need to bump the version number here:

# unity-mir
$ dch -v 0.4-0ubuntu1

# unity8
$ dch -v 7.86-0ubuntu1

And add:

# to libunity-mir1
Breaks: unity8 (<< 7.86)

# to unity8 for libunity-mir1 depenedency
(>= 0.4)

review: Needs Fixing
lp:~cimi/unity8/unity8.upstart_unity-mir_variables updated
830. By Andrea Cimitan

New versions

Revision history for this message
Michał Sawicz (saviq) wrote :

UNRELEASED, not utopic, please.

review: Needs Fixing
lp:~cimi/unity8/unity8.upstart_unity-mir_variables updated
831. By Andrea Cimitan

unreleased

Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/unity8.conf'
2--- data/unity8.conf 2014-04-09 13:22:43 +0000
3+++ data/unity8.conf 2014-04-29 10:12:59 +0000
4@@ -12,6 +12,9 @@
5 expect stop
6
7 pre-start script
8+ # Tell unity-mir to raise SIGSTOP after we start
9+ initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
10+
11 if [ -n "$MIR_SOCKET" ]; then
12 if [ -z "$UNITY_MIR_SOCKET" ]; then
13 # Save original value of MIR_SOCKET in case we are restarted,
14@@ -46,3 +49,8 @@
15 end script
16
17 exec ${BINARY:-unity8} $ARGS
18+
19+post-stop script
20+ initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
21+ initctl unset-env --global UNITY_MIR_SOCKET
22+end script
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2014-04-16 13:45:01 +0000
26+++ debian/changelog 2014-04-29 10:12:59 +0000
27@@ -1,3 +1,10 @@
28+unity8 (7.86-0ubuntu1) UNRELEASED; urgency=medium
29+
30+ [ Andrea Cimitan ]
31+ * Update upstart job to reflect latest unity-mir changes
32+
33+ -- Andrea Cimitan <andrea.cimitan@gmail.com> Tue, 29 Apr 2014 09:13:06 +0100
34+
35 unity8 (7.85+14.04.20140416-0ubuntu1) trusty; urgency=low
36
37 [ Albert Astals ]
38
39=== modified file 'debian/control'
40--- debian/control 2014-04-09 14:51:09 +0000
41+++ debian/control 2014-04-29 10:12:59 +0000
42@@ -72,7 +72,7 @@
43 Provides: indicator-renderer,
44 Depends: gsettings-desktop-schemas,
45 libglib2.0-bin,
46- libunity-mir1,
47+ libunity-mir1 (>= 0.4),
48 qmenumodel-qml (>= 0.2.7),
49 qtdeclarative5-dee-plugin,
50 qtdeclarative5-gsettings1.0,
51
52=== modified file 'tests/autopilot/unity8/shell/tests/test_upstart.py'
53--- tests/autopilot/unity8/shell/tests/test_upstart.py 2014-02-23 02:42:31 +0000
54+++ tests/autopilot/unity8/shell/tests/test_upstart.py 2014-04-29 10:12:59 +0000
55@@ -82,7 +82,7 @@
56 ))
57
58 def test_no_sigstop(self):
59- self.patch_environment("UPSTART_JOB", "foo")
60+ self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "")
61 self._launch_unity()
62 self._set_proxy()
63
64@@ -91,7 +91,7 @@
65 logger.debug("Unity loaded and ready.")
66
67 def test_expect_sigstop(self):
68- self.patch_environment("UPSTART_JOB", "unity8")
69+ self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "1")
70 self._launch_unity()
71 self.assertThat(lambda: os.WIFSTOPPED(self._get_status()), Eventually(Equals(True)), "Unity8 should raise SIGSTOP when ready")
72

Subscribers

People subscribed via source and target branches