Merge ~hloeung/jenkins-agent-charm:master into jenkins-agent-charm:master

[Haw Loeung]

Fixed to always restart/respawn - LP:1847939.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Paul Collins (pjdc)]

review: Approve (lgtm)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 4965b020fb1d6614db32130f366190d19769903f

diff --git a/files/jenkins-slave-systemd-config b/files/jenkins-slave-systemd-config
index 5a68c6c..516b703 100644
--- a/files/jenkins-slave-systemd-config
+++ b/files/jenkins-slave-systemd-config
@@ -8,7 +8,9 @@ After=network.target
 
 [Service]
 Type=simple
-Restart=on-failure
+# Always be Jenkinsing!
+Restart=always
+RestartSec=3
 ExecStartPre=/bin/bash -c '[ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave ; [ -n "$JENKINS_URL" ] || { exit 1; };  mkdir $JENKINS_RUN  > /dev/null 2>&1  || true ; chown -R $JENKINS_USER $JENKINS_RUN || true ; /usr/local/sbin/download-slave.sh $JENKINS_URL'
 ExecStart=/bin/bash -c '[ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave ; exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-slave -- $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS'
 
diff --git a/files/jenkins-slave-upstart-config b/files/jenkins-slave-upstart-config
index 446e739..0456e1d 100644
--- a/files/jenkins-slave-upstart-config
+++ b/files/jenkins-slave-upstart-config
@@ -9,6 +9,7 @@ start on runlevel [2345]
 stop on runlevel [!2345]
 
 # Always be Jenkinsing!
+respawn
 respawn limit unlimited
 
 pre-start script
@@ -24,3 +25,6 @@ script
     exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-slave \
         -- $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS 
 end script
+
+# Don't respawn too fast.
+post-stop exec sleep 3