Merge lp:~matsubara/charms/trusty/jenkins-slave/trusty-jenkins-slave into lp:~juju-qa/charms/trusty/jenkins-slave/trunk

[Diogo Matsubara]

Fix bug 1232886 by exporting the credentials from the jenkins master to the jenkins slave, so the slave agent can download the slave.jnlp file from the master and connect successfully.

Adds the extension interface to the charm so it can be used with the ci-configurator charm

Remove start/stop hooks since the slave should only be started or stopped based on its relation to the master.

[Curtis Hovey (sinzui)]

Hi Diogo.

I think this change will break slaves that don't need credentials.

review: Needs Information (code)

[lp:~matsubara/charms/trusty/jenkins-slave/trusty-jenkins-slave]

26. By Diogo Matsubara on 2015-09-23

review comments: fix credentials to cope with old slave versions that doesn't need credentials

[Diogo Matsubara (matsubara)]

> Hi Diogo.
>
> I think this change will break slaves that don't need credentials.

Hi Curtis,

I fixed the code per your review comments. Now the code checks if for username and password and update the config file accordingly. If there's no username and password, it will only update the jenkins url.

Thanks for the review!

Diogo

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

[lp:~matsubara/charms/trusty/jenkins-slave/trusty-jenkins-slave]

27. By Diogo Matsubara on 2015-09-23

forgot a space in if conditional

=== modified file 'hooks/slave-relation-changed'
--- hooks/slave-relation-changed	2012-07-27 10:51:16 +0000
+++ hooks/slave-relation-changed	2015-09-23 15:10:40 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eux
 
 # Setup connection to master instance once set
 url=$(relation-get url)
@@ -19,6 +19,18 @@
        -e "s!^#*JENKINS_URL.*!JENKINS_URL=${url}!" \
         /etc/default/jenkins-slave
 
+# Update JENKINS_ARGS so it can connect to the master and retrieve the agent
+# jnlp.
+username=$(relation-get username)
+password=$(relation-get password)
+credentials=""
+if [[ -n "${password}" && -n "${username}" ]]; then
+    juju-log "Configuring jenkins-slave credentials..."
+    credentials="-jnlpCredentials ${username}:${password}"
+fi
+
+sed -i -e "s!^JENKINS_ARGS.*!JENKINS_ARGS=\"-jnlpUrl \$JENKINS_URL/computer/\$JENKINS_HOSTNAME/slave-agent.jnlp ${credentials}\"!" /etc/default/jenkins-slave
+
 juju-log "Restarting jenkins-slave..."
 # Startup the jenkins-slave service
 stop jenkins-slave 2>/dev/null || true

=== modified file 'hooks/slave-relation-joined'
--- hooks/slave-relation-joined	2014-04-09 15:33:59 +0000
+++ hooks/slave-relation-joined	2015-09-23 15:10:40 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eux
 
 # Set the slave hostname to match the juju unit
 # in the jenkins master instance

=== removed file 'hooks/start'
--- hooks/start	2011-08-02 08:53:54 +0000
+++ hooks/start	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-start jenkins-slave || true

=== removed file 'hooks/stop'
--- hooks/stop	2011-08-02 08:53:54 +0000
+++ hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-stop jenkins-slave

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-05-15 16:22:53 +0000
+++ metadata.yaml	2015-09-23 15:10:40 +0000
@@ -12,3 +12,7 @@
 provides:
   slave:
     interface: jenkins-slave
+  extension:
+    interface: jenkins-extension
+    scope: container
+    optional: true