Merge lp:~lutostag/charms/trusty/jenkins-slave/trusty-jenkins-slave+executors into lp:~matsubara/charms/trusty/jenkins-slave/trusty-jenkins-slave

[Greg Lutostanski]

Allow setting number of executors explicitly as a charm option

[lp:~lutostag/charms/trusty/jenkins-slave/trusty-jenkins-slave+executors]

29. By Greg Lutostanski on 2016-01-12

config option name change executors->slave-executors

Unmerged revisions

29. By Greg Lutostanski on 2016-01-12

config option name change executors->slave-executors

28. By Greg Lutostanski on 2015-12-18

allow explicit setting of executors for slave

=== modified file 'config.yaml'
--- config.yaml	2014-03-26 03:14:41 +0000
+++ config.yaml	2016-01-12 16:30:47 +0000
@@ -1,4 +1,9 @@
 options:
+  slave-executors:
+    type: int
+    description: |
+      Number of executors to configure for this slave.  By default, slave will
+      get one for each core listed in /proc/cpuinfo.
   tools:
     type: string
     default: git gcc make bzr
 
=== modified file 'hooks/slave-relation-joined'
--- hooks/slave-relation-joined	2015-09-03 15:17:43 +0000
+++ hooks/slave-relation-joined	2016-01-12 16:30:47 +0000
@@ -5,13 +5,17 @@
 # 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`
+noexecutors=`config-get slave-executors`
 config_labels=`config-get labels`
 labels=`uname -p`
 
 if [ -n "$config_labels" ]; then
     labels=$config_labels
 fi
+if [ -z "$noexecutors" ]; then
+    noexecutors=`cat /proc/cpuinfo | grep processor | wc -l`
+fi
+
 
 # Set all relations
 relation-set executors=$noexecutors