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
=== modified file 'charms/precise/lander-jenkins/hooks/hooks.py'
--- charms/precise/lander-jenkins/hooks/hooks.py 2014-03-10 22:25:00 +0000
+++ charms/precise/lander-jenkins/hooks/hooks.py 2014-03-22 00:05:50 +0000
@@ -210,9 +210,9 @@
210 start on (local-filesystems and net-device-up IFACE=eth0)210 start on (local-filesystems and net-device-up IFACE=eth0)
211 stop on runlevel [!12345]211 stop on runlevel [!12345]
212212
213 # If the process quits unexpectadly trigger respawn it, unless it213 # If the process quits unexpectedly trigger respawn it
214 # fails 15 times within 5 seconds
215 respawn214 respawn
215 # unless it fails 15 times within 5 seconds
216 respawn limit 15 5216 respawn limit 15 5
217217
218 setuid {uid}218 setuid {uid}
219219
=== modified file 'charms/precise/rabbitmq-worker/hooks/hooks.py'
--- charms/precise/rabbitmq-worker/hooks/hooks.py 2014-03-10 22:25:00 +0000
+++ charms/precise/rabbitmq-worker/hooks/hooks.py 2014-03-22 00:05:50 +0000
@@ -121,9 +121,9 @@
121 # use sigint so python code just needs to catch KeyboardInterrupt121 # use sigint so python code just needs to catch KeyboardInterrupt
122 kill signal SIGINT122 kill signal SIGINT
123123
124 # If the process quits unexpectadly trigger respawn it, unless it124 # If the process quits unexpectedly trigger respawn it
125 # fails 15 times within 5 seconds
126 respawn125 respawn
126 # unless it fails 15 times within 5 seconds
127 respawn limit 15 5127 respawn limit 15 5
128128
129 setuid {uid}129 setuid {uid}
130130
=== modified file 'juju-deployer/production-only.yaml'
--- juju-deployer/production-only.yaml 2014-03-10 22:25:00 +0000
+++ juju-deployer/production-only.yaml 2014-03-22 00:05:50 +0000
@@ -8,7 +8,7 @@
8 # like tests/ppa_assigner/test.py which would trigger cleaning of a8 # like tests/ppa_assigner/test.py which would trigger cleaning of a
9 # ppa when its not really necessary9 # ppa when its not really necessary
10 ppa-cleaner:10 ppa-cleaner:
11 branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@611 branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@7
12 charm: upstart12 charm: upstart
13 options:13 options:
14 service-name: ppa-cleaner14 service-name: ppa-cleaner

Subscribers

People subscribed via source and target branches