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

[Curtis Hovey]

These changes allow jenkins-slave charm to be deployed to trusty and utopic.

Jenkins was removed from Ubuntu trusty. It is not possible to install jenkins from Ubuntu archives on trusty.
I need to deploy trusty jenkins-slaves into closed networks. I cannot install the slave via PPA.
I also intend to relate the trusty jenkins-slave to a precise jenkins master.

Jenkins as a sordid history of introducing incompatibilities with previous version. A small version change can prevent a slave from talking to a master or break hundreds of plugins. I choose to include the precise jenkins-slave package in the charm to ensure this charm is compatible with the only master jenkins a user can deploy (a precise one).

I refactored install to make it easier to read and more robust.

You don't have to accept this, but since I have a queue of people wanting this charm, mine will be the one used in the wild, and by other Canonical divisions :)

[Charles Butler (lazypower)]

Greetings,

I've had a chance to review this great jenkins slave submission! I do have a few nit picks with commentary on how to improve, they are as follows:

The README, while now being present - is still extremely light on details. It would be nice to cover all the basics of a readme. If you have the charm-tools package installed, issue 'charm add readme' and fill out the pertinent portions of the readme that effect the jenkins-slave charm complete with but not limited to:

- Configuration
- Upstream Details on where to file bugs/ how to contact the maintainer
- adding the details from hooks/install.d into the main README
- Adding details on how to provide a newer DPKG than whats packaged in the charm

In the metadata.yaml, where James Page is still the listed maintainer. Is the Juju QA team taking over the Jenkins Charm suite? If so, it would be brilliant if you could set the QA team as the maintainer of the charm in the metadata.

While I like the concept of fat charms and using the deb packaged within the charm itself, it would be another great addition to add the option for installation from a PPA - such as outlined here: https://wiki.jenkins-ci.org/display/JENKINS/Installing+Jenkins+on+Ubuntu

All in all this is a great submission. I deployed 3 nodes, everything seems to be in order.

Thank you for a great submission! I look forward to seeing future contributions.

review: Approve

[Curtis Hovey (sinzui)]

We cannot add support for the jenkins built debs until the jenkins master charm is updated to support it. The slave must match the master for all series. That is why I chose to reuse the precise deb...ubuntu and juju charms only support precise jenkins masters of version 1.424.6+dfsg-1ubuntu0.2 at this time :(

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2014-05-15 19:05:29 +0000
@@ -0,0 +1,23 @@
+# Overview
+
+This charm provisions a Jenkins slave to connect to a Jenkins master.
+This is the companion to the Jenkins charm.
+
+
+# Usage
+
+To deploy a Jenkins slave you will also need to deploy the jenkins master
+charm. This can be done as follows:
+
+    juju deploy jenkins
+    juju deploy -n 5 jenkins-slave
+    juju add-relation jenkins jenkins-slave
+
+There are cases where you want to provision a specific machine that
+provides specific resources for tests, such as CPU architecture or
+network access. You can deploy the extra slave like this:
+
+    juju add-machine <special-machine-private-ip>
+    juju deploy --to <special-mabine-number> jenkins-slave ppc-slave
+
+See the Jenkins charm for more details.

=== added directory 'files'
=== added file 'files/jenkins-slave_1.424.6+dfsg-1ubuntu0.2_all.deb'
Binary files files/jenkins-slave_1.424.6+dfsg-1ubuntu0.2_all.deb	1970-01-01 00:00:00 +0000 and files/jenkins-slave_1.424.6+dfsg-1ubuntu0.2_all.deb	2014-05-15 19:05:29 +0000 differ
=== modified file 'hooks/install'
--- hooks/install	2012-07-31 13:47:53 +0000
+++ hooks/install	2014-05-15 19:05:29 +0000
@@ -1,28 +1,55 @@
 #!/bin/bash
 
-set -eu
-
+set -eux
+
+
+# Install the slave if it is not installed already.
 install_slave () {
-	juju-log "Installing jenkins-slave..."
-	apt-get -y install -qq jenkins-slave wget
+    juju-log "Installing jenkins-slave..."
+    if [[ ! -f /etc/init/jenkins-slave.conf ]]
+    then
+        if [[ $(apt-cache madison jenkins-slave) =~ .*jenkins-slave.* ]]
+        then
+            apt-get -y install -qq jenkins-slave wget
+        else
+            # This series doesn't provide a jenkins.
+            # Install the same slave package as the precise Jenkins master.
+            apt-get -y install -qq wget adduser default-jre-headless upstart-job
+            dpkg -i files/jenkins-slave_*.deb
+        fi
+    else
+        juju-log "Jenkins-slave is already installed"
+    fi
 }
-[[ -f /etc/init/jenkins-slave.conf ]] || install_slave
-
-# Install some tools - can get set up deployment time
+
+
+# Install extra packages needed by the slave.
 install_tools () {
-	juju-log "Installing tools..."
-	apt-get -y install -qq `config-get tools`
-}
+    juju-log "Installing tools..."
+    apt-get -y install -qq $(config-get tools)
+}
+
+
+# Execute any hook overlay which may be provided
+# by forks of this charm.
+install_extra_hooks () {
+    juju-log "Installing hooks..."
+    if [[ -d hooks/install.d ]]
+    then
+        for i in $(ls -1 hooks/install.d/*)
+        do
+            if [[ -x $i ]]
+            then
+                source ./$i
+            fi
+        done
+    else
+        juju-log "No extra hooks found."
+    fi
+}
+
+
+install_slave
 install_tools
-
-# Execute any hook overlay which may be provided
-# by forks of this charm
-if [ -d hooks/install.d ]
-then
-    for i in `ls -1 hooks/install.d/*`
-    do
-        [[ -x $i ]] && . ./$i
-    done
-fi
-
+install_extra_hooks
 exit 0

=== renamed file 'hooks/install.d/README' => 'hooks/install.d/README.md'
--- hooks/install.d/README	2012-07-27 09:43:45 +0000
+++ hooks/install.d/README.md	2014-05-15 19:05:29 +0000
@@ -1,7 +1,7 @@
-This directory can be used to extend the function
-of the jenkins master charm without changing any
-of the base hooks.
-
-Files must be executable otherwise the install hook
-(which is also run on upgrade-charm and config-changed
-hooks) will not execute them.
+# hooks/install.d
+
+This directory can be used to extend the function of the jenkins master
+charm without changing any of the base hooks.
+
+Files must be executable otherwise the install hook (which is also run
+on upgrade-charm and config-changed hooks) will not execute them.

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-03-26 03:14:41 +0000
+++ metadata.yaml	2014-05-15 19:05:29 +0000
@@ -6,7 +6,7 @@
   flexible continous integration and deployment methodologies
   and more.
   .
-  This formula provides support for jenkins slaves
+  This charm provides support for jenkins slaves
 categories:
   - applications
 provides: