Merge lp:~pwlars/charms/xenial/jenkins-remote-slave/xenial-jenkins-remote-slave-charm into lp:~canonical-ci-engineering/charms/xenial/jenkins-remote-slave/trunk

[Paul Larson]

This seems to get things working for xenial and systemd

[Paul Larson (pwlars)]

Already been tested and seems to deploy fine with xenial and systemd. pushing

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2016-03-23 03:39:48 +0000
+++ hooks/install	2016-06-01 18:13:44 +0000
@@ -13,8 +13,7 @@
         # Install the same slave package as the precise Jenkins master.
         # Always install from the in-charm deb so that the modifications
         # are always applied to the same files.
-        apt-get -y install -qq wget adduser default-jre-headless upstart-job
-        dpkg -i files/jenkins-slave_*.deb
+        apt-get -y install -qq wget adduser default-jre-headless jenkins-slave ||true
     else
         juju-log "Jenkins-slave is already installed"
     fi
@@ -22,17 +21,17 @@
 
 
 modify_jenkins_settings () {
-        install /etc/init/jenkins-slave.conf "/etc/init/jenkins-slave-remote-${slave_name}.conf"
-        # Append a respawn stanza.
-        sed -i -e "/stop on/arespawn\nrespawn limit 10 5" \
-               -e "s!jenkins-slave!jenkins-slave-remote-${slave_name}!g" \
-                "/etc/init/jenkins-slave-remote-${slave_name}.conf"
+        install "/lib/systemd/system/jenkins-slave.service" "/lib/systemd/system/jenkins-slave-remote-${slave_name}.service"
+        # Patch the path to the EnvironmentFile
+        sed -i -e "s!jenkins-slave!jenkins-slave-remote-${slave_name}!g" \
+                "/lib/systemd/system/jenkins-slave-remote-${slave_name}.service"
         install "/etc/default/jenkins-slave" "/etc/default/jenkins-slave-remote-${slave_name}"
         sed -i -e "s!^JENKINS_RUN.*!JENKINS_RUN=/var/run/jenkins/${slave_name}!" \
                -e "s!^#*JENKINS_URL.*!JENKINS_URL=${master_url}!" \
                -e "s!^JENKINS_HOSTNAME.*!JENKINS_HOSTNAME=${slave_name}!" \
                -e "s!jenkins-slave!jenkins-slave-remote-${slave_name}!" \
                "/etc/default/jenkins-slave-remote-${slave_name}"
+        systemctl daemon-reload
 }
 
 
@@ -66,7 +65,7 @@
 apt-get update || apt-get update || apt-get update
 
 # For config-changed, we want to ensure slave gets stopped and restarted
-# FIXME: 20140926 fginther - check if the upstart job is running first
+# FIXME: 20140926 fginther - check if the service is running first
 # https://app.asana.com/0/15652576021427/16759381549805
 hooks/stop || true
 install_slave

=== modified file 'hooks/start'
--- hooks/start	2014-09-18 20:49:08 +0000
+++ hooks/start	2016-06-01 18:13:44 +0000
@@ -2,4 +2,4 @@
 
 slave_name=`config-get slave_name`
 
-start jenkins-slave-remote-${slave_name} || true
+service jenkins-slave-remote-${slave_name} start || true

=== modified file 'hooks/stop'
--- hooks/stop	2014-09-18 20:49:08 +0000
+++ hooks/stop	2016-06-01 18:13:44 +0000
@@ -2,4 +2,4 @@
 
 slave_name=`config-get slave_name`
 
-stop jenkins-slave-remote-${slave_name}
+service jenkins-slave-remote-${slave_name} stop || true