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

[Vincent Ladeuil]

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

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.

[PS Jenkins bot (ps-jenkins)]

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

=== 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 @@
     start on (local-filesystems and net-device-up IFACE=eth0)
     stop on runlevel [!12345]
 
-    # If the process quits unexpectadly trigger respawn it, unless it
-    # fails 15 times within 5 seconds
+    # If the process quits unexpectedly trigger respawn it
     respawn
+    # unless it fails 15 times within 5 seconds
     respawn limit 15 5
 
     setuid {uid}

=== 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 @@
     # use sigint so python code just needs to catch KeyboardInterrupt
     kill signal SIGINT
 
-    # If the process quits unexpectadly trigger respawn it, unless it
-    # fails 15 times within 5 seconds
+    # If the process quits unexpectedly trigger respawn it
     respawn
+    # unless it fails 15 times within 5 seconds
     respawn limit 15 5
 
     setuid {uid}

=== 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 @@
         # like tests/ppa_assigner/test.py which would trigger cleaning of a
         # ppa when its not really necessary
         ppa-cleaner:
-            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@6
+            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@7
             charm: upstart
             options:
                 service-name: ppa-cleaner