Unity 8

Merge lp:~nicolas-doffay/unity8/upstart-kill-fix into lp:unity8

  1. upstart-kill-fix
  2. Merge into trunk
Proposed by Nicolas d'Offay
Status: Merged
Approved by: Michał Sawicz
Approved revision: 596
Merged at revision: 596
Proposed branch: lp:~nicolas-doffay/unity8/upstart-kill-fix
Merge into: lp:unity8
Diff against target: 12 lines (+2/-0)
2 files modified
data/unity8.override (+1/-0)
debian/unity8-autopilot.install (+1/-0)
To merge this branch: bzr merge lp:~nicolas-doffay/unity8/upstart-kill-fix
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+198931@code.launchpad.net

Commit message

Added kill time 30 to unity8 override.
Added install path.

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Don't put the "description" and "author" fields in there - they override the ones from the original unity8.conf for no reason.

Did you test that the built unity8-autopilot package actually includes that file? 'Cause I'm pretty sure it does not.

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

FAILED: Continuous integration, rev:594
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nicolas-doffay/unity8/upstart-kill-fix/+merge/198931/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/1894/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1698/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1629/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/671/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/417/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/417/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1698/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1629/console

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

review: Needs Fixing (continuous-integration)
lp:~nicolas-doffay/unity8/upstart-kill-fix updated
595. By Nicolas d'Offay

Removed description and author.

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

FAILED: Continuous integration, rev:595
http://jenkins.qa.ubuntu.com/job/unity8-ci/1899/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1709/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1640/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/682/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1709/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1640/console

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

review: Needs Fixing (continuous-integration)
lp:~nicolas-doffay/unity8/upstart-kill-fix updated
596. By Nicolas d'Offay

Added install path.

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

Yup.

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

FAILED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/unity8-ci/1900/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1712
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1643/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/424
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1643
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1643/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4149/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2344

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

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

kill timeout 30, stanza should be in data/unity8.conf not in data/unity8.override. Users can drop ~/.config/upstart/unity8.override (which is done by e.g. automated smoke testing) and in that case global unity8.conf will be used with the ~/.config/upstart/unity8.override and the global unity8.override will be ignored.

review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

ignore that comment, I didn't realise .override is not shipped in unity8 package.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/unity8.override'
2--- data/unity8.override 1970-01-01 00:00:00 +0000
3+++ data/unity8.override 2013-12-13 16:11:37 +0000
4@@ -0,0 +1,1 @@
5+kill timeout 30
6
7=== modified file 'debian/unity8-autopilot.install'
8--- debian/unity8-autopilot.install 2013-07-10 18:04:27 +0000
9+++ debian/unity8-autopilot.install 2013-12-13 16:11:37 +0000
10@@ -1,1 +1,2 @@
11 usr/lib/python*/*/unity*
12+data/unity8.override usr/share/upstart/sessions

Subscribers

People subscribed via source and target branches