Merge lp:~saviq/unity8/move-upstart-timeout into lp:unity8

Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 642
Merged at revision: 683
Proposed branch: lp:~saviq/unity8/move-upstart-timeout
Merge into: lp:unity8
Diff against target: 25 lines (+2/-2)
3 files modified
data/unity8.conf (+2/-0)
data/unity8.override (+0/-1)
debian/unity8-autopilot.install (+0/-1)
To merge this branch: bzr merge lp:~saviq/unity8/move-upstart-timeout
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
Review via email: mp+202041@code.launchpad.net

Commit message

Move upstart kill timeout to the unity8 job itself.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. Works as expected.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes. Didrocks reviewed already.

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Full stacktraces, what a luxury! \o/

for some context:
07:47:17 Saviq | didrocks, so what I'm actually thinking is moving it to unity8 itself
07:47:32 didrocks | Saviq: yeah, I think it's making sense
07:47:38 Saviq | didrocks, as it only ever changes things when you go "initctl unity8 stop"
07:47:39 didrocks | I was about to suggest the same :)
07:48:05 Saviq | which normal users won't do, and if it crashes runtime, it will wait for apport to complete anyway
07:48:11 didrocks | exactly

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/945/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3901
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2416
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/331
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2277
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2277/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4724/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3160

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

FAILED: Continuous integration, rev:642
http://jenkins.qa.ubuntu.com/job/unity8-ci/2095/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2418
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2279/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/619
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2420
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2279
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2279/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4726/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3162

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

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

FAILED: Continuous integration, rev:642
http://jenkins.qa.ubuntu.com/job/unity8-ci/2096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2422
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2281/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/620
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2424
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2281
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2281/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4727/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3163

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

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

FAILED: Continuous integration, rev:642
http://jenkins.qa.ubuntu.com/job/unity8-ci/2205/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/727
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/729
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2837
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2584/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5011
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3555

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

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

 * Did you perform an exploratory manual test run of the code change and any related functionality?
No functioanlity changes

 * Did CI run pass? If not, please explain why.
No, because it's broken for some other reason.

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 2013-11-18 09:40:38 +0000
3+++ data/unity8.conf 2014-01-17 06:52:29 +0000
4@@ -4,6 +4,8 @@
5 start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
6 stop on desktop-end
7
8+kill timeout 30
9+
10 respawn
11 expect stop
12
13
14=== removed file 'data/unity8.override'
15--- data/unity8.override 2013-12-13 14:23:33 +0000
16+++ data/unity8.override 1970-01-01 00:00:00 +0000
17@@ -1,1 +0,0 @@
18-kill timeout 30
19
20=== modified file 'debian/unity8-autopilot.install'
21--- debian/unity8-autopilot.install 2013-12-13 15:49:18 +0000
22+++ debian/unity8-autopilot.install 2014-01-17 06:52:29 +0000
23@@ -1,2 +1,1 @@
24 usr/lib/python*/*/unity*
25-data/unity8.override usr/share/upstart/sessions

Subscribers

People subscribed via source and target branches