Merge lp:~psivaa/uci-engine/lander-jenkins-plugin into lp:uci-engine/mthood

[Para Siva]

Change to include parameterized-trigger plugin inside the charm instead of downloading it from the jenkins site to be made suitable for private mthood cloud

Note: For this to work well https://code.launchpad.net/~psivaa/charms/precise/jenkins/bundle-jenkins/+merge/215635 needs merging first

Change to include parameterized-trigger plugin inside the charm instead of downloading it from the jenkins site to be made suitable for private mthood cloud

Note: For this to work well https://code.launchpad.net/~psivaa/charms/precise/jenkins/bundle-jenkins/+merge/215635 needs merging first

[lp:~psivaa/uci-engine/lander-jenkins-plugin]

415. By Para Siva on 2014-05-15

Include mthood specific jenkins charm branch

[Francis Ginther (fginther)]

I don't see how the plugin gets copied from the charm local directory to the jenkins plugin directory (see inline comment).

review: Needs Fixing

Unmerged revisions

415. By Para Siva on 2014-05-15

Include mthood specific jenkins charm branch

414. By Para Siva on 2014-05-09

plugin name format in yaml

413. By Para Siva on 2014-05-09

Plugins included in lander-jenkins

=== added directory 'charms/precise/lander-jenkins/files'
=== added directory 'charms/precise/lander-jenkins/files/plugins'
=== added file 'charms/precise/lander-jenkins/files/plugins/parameterized-trigger.hpi'
Binary files charms/precise/lander-jenkins/files/plugins/parameterized-trigger.hpi	1970-01-01 00:00:00 +0000 and charms/precise/lander-jenkins/files/plugins/parameterized-trigger.hpi	2014-05-15 11:17:32 +0000 differ
=== modified file 'charms/precise/lander-jenkins/hooks/hooks.py'
--- charms/precise/lander-jenkins/hooks/hooks.py	2014-03-10 22:25:00 +0000
+++ charms/precise/lander-jenkins/hooks/hooks.py	2014-05-15 11:17:32 +0000
@@ -14,12 +14,12 @@
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 from charmhelpers import core
 from charmhelpers import fetch
-from charmhelpers.fetch import bzrurl
 
 JENKINS_HOME = '/var/lib/jenkins'
 JENKINS_USER = 'jenkins'
 JENKINS_GROUP = 'nogroup'
 NUM_EXECUTORS_LINE = '  <numExecutors>{}</numExecutors>\n'
+PLUGIN_LOCAL = os.path.join(os.environ['CHARM_DIR'], 'files/plugins')
 
 
 def juju_info(msg, level='INFO'):
@@ -149,49 +149,76 @@
     plugin_list = config['plugins'].split()
     plugins_site = config['plugins-site']
     for plugin in plugin_list:
-        if ':' in plugin:
-            (name, version) = plugin.split(':')
-            # A specific version is being requested
-            url = '{}/download/plugins/{}/{}/{}.hpi'.format(
-                plugins_site, name, version, name)
-            plugin_file = '{}-{}.hpi'.format(name, version)
-        else:
-            url = '{}/latest/{}.hpi'.format(plugins_site, plugin)
-            plugin_file = '{}.hpi'.format(name)
-        juju_info('Installing {} from {}'.format(plugin_file, url))
-        plugin_file = os.path.join(JENKINS_HOME, 'plugins', plugin_file)
-        cmd = ['wget', '-O', plugin_file, url]
-        subprocess.check_call(cmd)
+        plugin = '{}.hpi'.format(plugin)
+        plugin_file = os.path.join(PLUGIN_LOCAL, plugin)
+        if not os.path.exists(plugin_file):
+            if ':' in plugin:
+                (name, version) = plugin.split(':')
+                # A specific version is being requested
+                url = '{}/download/plugins/{}/{}/{}.hpi'.format(
+                    plugins_site, name, version, name)
+                plugin_file = '{}-{}.hpi'.format(name, version)
+            else:
+                url = '{}/latest/{}.hpi'.format(plugins_site, plugin)
+                plugin_file = plugin
+            juju_info('Installing {} from {}'.format(plugin_file, url))
+            plugin_file = os.path.join(JENKINS_HOME, 'plugins', plugin_file)
+            cmd = ['wget', '-O', plugin_file, url]
+            subprocess.check_call(cmd)
+
         cmd = ['chown', '-R', '{}.{}'.format(JENKINS_USER, JENKINS_GROUP),
                plugin_file]
         subprocess.check_call(cmd)
 
 
-def _install_from_tarball(config):
+def _install_from_tarball(config, upgrade):
     juju_info('grabbing service from tarball...')
     sdir = _service_dir(config)
+    if not upgrade:
+        if os.path.exists(sdir):
+            juju_info('deleting pre-existing service directory: %s' % sdir)
+            shutil.rmtree(sdir)
+        os.mkdir(sdir)
+    cmd = 'curl %s | tar -xzC %s' % (config['tarball'], sdir)
+    subprocess.check_call(cmd, shell=True)
+
+
+def _install_from_bzr(config, upgrade):
+    juju_info('grabbing service from bzr...')
+
+    sdir = _service_dir(config)
+    rev = config.get('revno', '')
+
+    if upgrade:
+        args = ['bzr', 'pull']
+        if rev:
+            args.extend(['-r', rev])
+        subprocess.check_call(args, cwd=sdir)
+        return
+
     if os.path.exists(sdir):
         juju_info('deleting pre-existing service directory: %s' % sdir)
         shutil.rmtree(sdir)
-    os.mkdir(sdir)
-    cmd = 'curl %s | tar -xzC %s' % (config['tarball'], sdir)
-    subprocess.check_call(cmd, shell=True)
-
-
-def _install_from_bzr(config):
-    service_dir = _service_dir(config)
-    bzr = bzrurl.BzrUrlFetchHandler()
-    if os.path.exists(service_dir):
-        juju_info('deleting pre-existing service directory: %s' % service_dir)
-        shutil.rmtree(service_dir)
-    bzr.branch(config['branch'], service_dir)
-
-
-def install(config):
+
+    args = ['bzr', 'branch']
+    if rev:
+        args.extend(['-r', rev])
+    args.append(config['branch'])
+    args.append(sdir)
+    subprocess.check_call(args)
+
+
+def install(config, upgrade=False):
     if config.get('vcs') == 'tarball':
-        _install_from_tarball(config)
+        _install_from_tarball(config, upgrade)
     else:
-        _install_from_bzr(config)
+        _install_from_bzr(config, upgrade)
+
+
+def upgrade_charm(config):
+    install(config, True)
+    restart_jenkins(config)
+    restart_upstart(config)
 
 
 def create_unit_config(config):
@@ -210,9 +237,9 @@
     start on (local-filesystems and net-device-up IFACE=eth0)
     stop on runlevel [!12345]
 
-    # If the process quits unexpectadly trigger respawn it, unless it
-    # fails 15 times within 5 seconds
+    # If the process quits unexpectedly trigger respawn it
     respawn
+    # unless it fails 15 times within 5 seconds
     respawn limit 15 5
 
     setuid {uid}

=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl	2014-03-14 10:37:28 +0000
+++ juju-deployer/lander.yaml.tmpl	2014-05-15 11:17:32 +0000
@@ -21,7 +21,7 @@
                 wsgi_wsgi_file: lander.wsgi:app
         lander-jenkins:
             charm: jenkins
-            branch: lp:~ci-engineering-private/charms/precise/jenkins/ci-train@60
+            branch: lp:~ci-engineering-private/charms/precise/jenkins/mthood@61
             constraints: "cpu-cores=2 mem=8 root-disk=8192M"
             exposed: true
             options:
@@ -39,7 +39,7 @@
                 bot_password: lander-bot
                 sources: ${CI_PPA}
                 packages: "python-amqplib python-swiftclient lazr.enum"
-                plugins: "parameterized-trigger:2.14"
+                plugins: "parameterized-trigger"
                 unit-config: include-base64://configs/unit_config.yaml
                 main: ./run-python ./lander/lander/run_worker.py --service-name ts-django --service-port 8080 --delay 10
         rabbit: