Merge lp:~fginther/ubuntu-ci-services-itself/lander-address-and-executor-fixes into lp:ubuntu-ci-services-itself

[Francis Ginther]

If multiple private addresses are present for the jenkins instance, take the first one. Provide config option for specifying number of jenkins executors.

If multiple private addresses are present for the jenkins instance, take the first one. Provide config option for specifying number of jenkins executors.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:287
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/253/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/253/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

[Andy Doan (doanac)]

yeah!

=== modified file 'charms/precise/lander-jenkins/config.yaml'
--- charms/precise/lander-jenkins/config.yaml	2014-02-13 21:04:50 +0000
+++ charms/precise/lander-jenkins/config.yaml	2014-02-28 18:58:15 +0000
@@ -27,6 +27,10 @@
     type: string
     default: ""
     description: Launchpad login id of lander bot
+  num_executors:
+    type: int
+    default: 5
+    description: Number of executions slots for jenkins master.
   branch:
     type: string
     description: "BZR branch the service lives in"
 
=== modified file 'charms/precise/lander-jenkins/hooks/hooks.py'
--- charms/precise/lander-jenkins/hooks/hooks.py	2014-02-13 21:04:50 +0000
+++ charms/precise/lander-jenkins/hooks/hooks.py	2014-02-28 18:58:15 +0000
@@ -19,6 +19,7 @@
 JENKINS_HOME = '/var/lib/jenkins'
 JENKINS_USER = 'jenkins'
 JENKINS_GROUP = 'nogroup'
+NUM_EXECUTORS_LINE = '  <numExecutors>{}</numExecutors>\n'
 
 
 def juju_info(msg, level='INFO'):
@@ -233,6 +234,20 @@
         os.fsync(f.fileno())
 
 
+def update_jenkins_master(config):
+    juju_info('Updating master jenkins.')
+    jenkins_master_config = os.path.join(JENKINS_HOME, 'config.xml')
+    num_executors = config.get('num_executors', None)
+    if num_executors and os.path.exists(jenkins_master_config):
+        with open(jenkins_master_config) as in_file:
+            contents = in_file.readlines()
+        with open(jenkins_master_config, 'w') as out_file:
+            for line in contents:
+                out_file.write(line)
+                if line.startswith('<hudson>'):
+                    out_file.write(NUM_EXECUTORS_LINE.format(num_executors))
+
+
 def restart_jenkins(config):
     juju_info('Restarting jenkins.')
     core.host.service_stop('jenkins')
@@ -255,6 +270,7 @@
     setup_plugins(config)
     create_unit_config(config)
     create_upstart(config)
+    update_jenkins_master(config)
     restart_jenkins(config)
     restart_upstart(config)
 
@@ -262,6 +278,11 @@
 def lander_jenkins_relation_joined(config):
     juju_info("Config: %s" % config)
     hostname = subprocess.check_output(['unit-get', 'private-address']).strip()
+    if ',' in hostname:
+        # We can't have multiple hostnames, take the first one
+        juju_info('Found too many private-addresses {}'.format(hostname))
+        hostname = hostname.split(',')[0]
+        juju_info('Taking first private-address: {}'.format(hostname))
     lander_config = {
         'lander_username': config['bot_username'],
         'lander_password': config['bot_password'],