Merge lp:~fginther/ubuntu-ci-services-itself/lander-in-source-plugin into lp:ubuntu-ci-services-itself

[Francis Ginther]

Add the required jenkins plugin for lander operation as an in-source file.

Add the required jenkins plugin for lander operation as an in-source file.

Is there a better way to store this file? It's a 90K binary. The only solution that comes to mind is to wrap it in a debian package and put it in the ppa.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Paul Larson (pwlars)]

How about having it wget from https://updates.jenkins-ci.org/download/plugins/parameterized-trigger/ and push that either directly to the instance, or to a swift location the instance can pull from?

Otherwise, if you want to just keep it in the tree, it might not be *that* bad. I don't think we expect to be doing frequent version changes - which would be very ugly with the binary blob there. With just a single 90k file in the tree, it shouldn't be too terrible.

[Francis Ginther (fginther)]

> How about having it wget from https://updates.jenkins-ci.org/download/plugins
> /parameterized-trigger/ and push that either directly to the instance, or to a
> swift location the instance can pull from?

I failed to mention that one of the goals of this MP is to completely remove the dependency on an external site 'updates.jenkins-ci.org'. https://bugs.launchpad.net/ubuntu-ci-services-itself/+bug/1285302

Even if we wget the file during the deploy script, I think that's still going to be a problem.

I spent a little bit of time experimenting with a jenkins-parameterized-trigger-plugin package which just wraps the plugin file in a deb. It looks promising, so I'm going to set this to Work In Progress will I pursue that.

[Francis Ginther (fginther)]

We're going to keep the dependency on jenkins-ci.org for now, so there is no urgency to change things just for this. Will keep on hold until after phase 0.

Unmerged revisions

301. By Francis Ginther on 2014-03-03

Add the required jenkins plugins as an in source file.

=== modified file 'charms/precise/lander-jenkins/hooks/hooks.py'
--- charms/precise/lander-jenkins/hooks/hooks.py	2014-02-28 18:57:57 +0000
+++ charms/precise/lander-jenkins/hooks/hooks.py	2014-03-03 23:16:43 +0000
@@ -146,6 +146,8 @@
 
 def setup_plugins(config):
     juju_info('Installing plugins.')
+
+    # First, install plugins specified in the config
     plugin_list = config['plugins'].split()
     plugins_site = config['plugins-site']
     for plugin in plugin_list:
@@ -166,6 +168,15 @@
                plugin_file]
         subprocess.check_call(cmd)
 
+    # Now install any plugins specified in the local plugin dir
+    plugin_dir = os.path.join(core.hookenv.charm_dir(), 'plugins')
+    for plugin in os.listdir(plugin_dir):
+        plugin_file = os.path.join(JENKINS_HOME, 'plugins', plugin)
+        shutil.copy(os.path.join(plugin_dir, plugin), plugin_file)
+        cmd = ['chown', '-R', '{}.{}'.format(JENKINS_USER, JENKINS_GROUP),
+               plugin_file]
+        subprocess.check_call(cmd)
+
 
 def _install_from_tarball(config):
     juju_info('grabbing service from tarball...')

=== added directory 'charms/precise/lander-jenkins/plugins'
=== added file 'charms/precise/lander-jenkins/plugins/parameterized-trigger-2.14.hpi'
Binary files charms/precise/lander-jenkins/plugins/parameterized-trigger-2.14.hpi	1970-01-01 00:00:00 +0000 and charms/precise/lander-jenkins/plugins/parameterized-trigger-2.14.hpi	2014-03-03 23:16:43 +0000 differ
=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl	2014-02-28 20:16:51 +0000
+++ juju-deployer/lander.yaml.tmpl	2014-03-03 23:16:43 +0000
@@ -35,7 +35,6 @@
                 bot_password: lander-bot
                 sources: ${CI_PPA}
                 packages: "python-amqplib python-swiftclient lazr.enum"
-                plugins: "parameterized-trigger:2.14"
                 unit-config: include-base64://configs/unit_config.yaml
                 main: ./lander/run_worker --service-name ts-django --service-port 8080 --delay 60
         rabbit: