Merge lp:~vila/ubuntu-ci-services-itself/1285386-ppa-cleaner-failed-to-start into lp:ubuntu-ci-services-itself

Proposed by Vincent Ladeuil on 2014-03-22
Status: Merged
Approved by: Vincent Ladeuil on 2014-03-25
Approved revision: 413
Merged at revision: 414
Proposed branch: lp:~vila/ubuntu-ci-services-itself/1285386-ppa-cleaner-failed-to-start
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 44 lines (+5/-5)
3 files modified
charms/precise/lander-jenkins/hooks/hooks.py (+2/-2)
charms/precise/rabbitmq-worker/hooks/hooks.py (+2/-2)
juju-deployer/production-only.yaml (+1/-1)
To merge this branch: bzr merge lp:~vila/ubuntu-ci-services-itself/1285386-ppa-cleaner-failed-to-start
Reviewer Review Type Date Requested Status
Andy Doan (community) 2014-03-22 Approve on 2014-03-25
PS Jenkins bot (community) continuous-integration Approve on 2014-03-22
Review via email: mp+212264@code.launchpad.net

Commit message

Use the upstart revision with the fix to respawn the ppa-cleaner on unexpected failures.

Description of the change

If/when
https://code.launchpad.net/~vila/charms/precise/ubuntu-ci-services-itself/upstart/+merge/212263 lands, this will take it into account.

Arguably we should merge the charm here to avoid this weird workflow.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:413
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/457/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/457/rebuild

review: Approve (continuous-integration)
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charms/precise/lander-jenkins/hooks/hooks.py'
2--- charms/precise/lander-jenkins/hooks/hooks.py 2014-03-10 22:25:00 +0000
3+++ charms/precise/lander-jenkins/hooks/hooks.py 2014-03-22 00:05:50 +0000
4@@ -210,9 +210,9 @@
5 start on (local-filesystems and net-device-up IFACE=eth0)
6 stop on runlevel [!12345]
7
8- # If the process quits unexpectadly trigger respawn it, unless it
9- # fails 15 times within 5 seconds
10+ # If the process quits unexpectedly trigger respawn it
11 respawn
12+ # unless it fails 15 times within 5 seconds
13 respawn limit 15 5
14
15 setuid {uid}
16
17=== modified file 'charms/precise/rabbitmq-worker/hooks/hooks.py'
18--- charms/precise/rabbitmq-worker/hooks/hooks.py 2014-03-10 22:25:00 +0000
19+++ charms/precise/rabbitmq-worker/hooks/hooks.py 2014-03-22 00:05:50 +0000
20@@ -121,9 +121,9 @@
21 # use sigint so python code just needs to catch KeyboardInterrupt
22 kill signal SIGINT
23
24- # If the process quits unexpectadly trigger respawn it, unless it
25- # fails 15 times within 5 seconds
26+ # If the process quits unexpectedly trigger respawn it
27 respawn
28+ # unless it fails 15 times within 5 seconds
29 respawn limit 15 5
30
31 setuid {uid}
32
33=== modified file 'juju-deployer/production-only.yaml'
34--- juju-deployer/production-only.yaml 2014-03-10 22:25:00 +0000
35+++ juju-deployer/production-only.yaml 2014-03-22 00:05:50 +0000
36@@ -8,7 +8,7 @@
37 # like tests/ppa_assigner/test.py which would trigger cleaning of a
38 # ppa when its not really necessary
39 ppa-cleaner:
40- branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@6
41+ branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@7
42 charm: upstart
43 options:
44 service-name: ppa-cleaner

Subscribers

People subscribed via source and target branches