Merge lp:~timrchavez/charm-helpers/jenkins-slave-fix-slave-relation-joined into lp:charm-helpers

[Timothy R. Chavez]

[Marco Ceppi (marcoceppi)]

I'm confused, is this supposed to be merged in to charm-helpers or in to jenkins-slave?

review: Needs Information

[Jorge Niedbalski (niedbalski)]

This seems to be wrongly proposed, this should be proposed against the jenkins-slave charm.

review: Disapprove

Unmerged revisions

11. By Timothy R. Chavez on 2014-04-09

Add missing 'relation-set' of 'slaveaddress' so that Jenkins slaves can
be added to the Jenkins master via the 'juju add-relation' interface.
Currently the Jenkins master hook assumes (see: master-relation-changed)
that the Jenkins slave sets 'slaveaddress' and will use value to add the
slave. If no value is set for 'slaveaddress', it will be empty, and the
'addnode' script it passes the value to will fail.

10. By James Page on 2012-08-06

Fix configuration issue and add extension features

9. By James Page on 2012-05-22

Made myself the maintainer

8. By Timothy R. Chavez on 2012-04-27

Normalize indentation in the install hook.

7. By James Page on 2011-10-07

Updates for revision and private-address

6. By James Page on 2011-09-22

Fixes for juju renaming

5. By James Page on 2011-09-12

Updated formula to work on natty and oneiric

4. By James Page on 2011-08-02

General tidy and added configuration options

3. By James Page on 2011-07-01

Renamed copyright

2. By James Page on 2011-06-30

Added license file

=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2014-04-09 16:45:21 +0000
@@ -0,0 +1,8 @@
+options:
+  tools:
+    type: string
+    default: git gcc make bzr
+    description: Tooling to deploy on jenkins slave node
+  labels:
+    type: string
+    description: Jenkins labels to associate with jenkins slave node

=== added file 'copyright'
--- copyright	1970-01-01 00:00:00 +0000
+++ copyright	2014-04-09 16:45:21 +0000
@@ -0,0 +1,17 @@
+Format: http://dep.debian.net/deps/dep5/
+
+Files: *
+Copyright: Copyright 2011, Canonical Ltd., All Rights Reserved.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== added directory 'hooks'
=== added symlink 'hooks/config-changed'
=== target is u'install'
=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2014-04-09 16:45:21 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -eu
+
+install_slave () {
+	juju-log "Installing jenkins-slave..."
+	apt-get -y install -qq jenkins-slave wget
+}
+[[ -f /etc/init/jenkins-slave.conf ]] || install_slave
+
+# Install some tools - can get set up deployment time
+install_tools () {
+	juju-log "Installing tools..."
+	apt-get -y install -qq `config-get tools`
+}
+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
+
+exit 0

=== added directory 'hooks/install.d'
=== added file 'hooks/install.d/README'
--- hooks/install.d/README	1970-01-01 00:00:00 +0000
+++ hooks/install.d/README	2014-04-09 16:45:21 +0000
@@ -0,0 +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.

=== added symlink 'hooks/slave-relation-broken'
=== target is u'slave-relation-departed'
=== added file 'hooks/slave-relation-changed'
--- hooks/slave-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/slave-relation-changed	2014-04-09 16:45:21 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+# Setup connection to master instance once set
+url=$(relation-get url)
+
+if [ "x$url" = "x" ]; then
+	juju-log "Master hasn't exported its url yet, exiting..."
+	exit 0
+fi
+
+# Set the slave hostname to match the juju unit
+# in the jenkins master instance
+slavehost=`echo ${JUJU_UNIT_NAME} | sed s,/,-,`
+
+juju-log "Configuring jenkins-slave with $url..."
+sed -i -e "s!^JENKINS_HOSTNAME.*!JENKINS_HOSTNAME=${slavehost}!" \
+       -e "s!^#*JENKINS_URL.*!JENKINS_URL=${url}!" \
+        /etc/default/jenkins-slave
+
+juju-log "Restarting jenkins-slave..."
+# Startup the jenkins-slave service
+stop jenkins-slave 2>/dev/null || true
+start jenkins-slave

=== added file 'hooks/slave-relation-departed'
--- hooks/slave-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/slave-relation-departed	2014-04-09 16:45:21 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+stop jenkins-slave || true

=== added file 'hooks/slave-relation-joined'
--- hooks/slave-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/slave-relation-joined	2014-04-09 16:45:21 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Set the slave hostname to match the juju unit
+# in the jenkins master instance
+slavehost=`echo ${JUJU_UNIT_NAME} | sed s,/,-,`
+noexecutors=`cat /proc/cpuinfo | grep processor | wc -l`
+config_labels=`config-get labels`
+labels=`uname -p`
+
+if [ -n "$config_labels" ]; then
+    labels=$config_labels
+fi
+
+# Set all relations
+relation-set executors=$noexecutors
+relation-set labels="$labels"
+relation-set slavehost=$slavehost
+relation-set slaveaddress=`unit-get private-address`

=== added file 'hooks/start'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2014-04-09 16:45:21 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+start jenkins-slave || true

=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2014-04-09 16:45:21 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+stop jenkins-slave

=== added symlink 'hooks/upgrade-charm'
=== target is u'install'
=== added file 'metadata.yaml'
--- metadata.yaml	1970-01-01 00:00:00 +0000
+++ metadata.yaml	2014-04-09 16:45:21 +0000
@@ -0,0 +1,13 @@
+ensemble: formula
+name: jenkins-slave
+maintainer: James Page <[e-mail]>
+summary: Jenkins CI Slave
+description: |
+  Jenkins is a Continous Integration server supporting
+  flexible continous integration and deployment methodologies
+  and more.
+  .
+  This formula provides support for jenkins slaves
+provides:
+  slave:
+    interface: jenkins-slave

=== added file 'revision'
--- revision	1970-01-01 00:00:00 +0000
+++ revision	2014-04-09 16:45:21 +0000
@@ -0,0 +1,1 @@
+9