Merge lp:~psivaa/charms/trusty/jenkaas/install-plugins into lp:~canonical-ci-engineering/charms/trusty/jenkaas/trunk

[Para Siva]

Installing jenkins plugins copied to charm/files/plugins by the spec

Installing jenkins plugins copied to charm/files/plugins by the spec

[Francis Ginther (fginther)]

I agree that we'll need to install the plugins by passing them along inside the charm payload. But I think we're better off actually coping them to /var/lib/jenkins/plugins and making sure they are owned by "jenkins:jenkins".

review: Needs Fixing

[lp:~psivaa/charms/trusty/jenkaas/install-plugins]

7. By Para Siva on 2015-06-16

Merging install jenkins

8. By Para Siva on 2015-06-16

pyflakes and pep8

9. By Para Siva on 2015-06-16

Copying instead of symlinking

10. By Para Siva on 2015-06-16

pep8 and pyflakes

11. By Para Siva on 2015-06-16

Set the ownership to the right plugins

[Para Siva (psivaa)]

Thanks Francis for the review and the informal review :). I think I've addressed your concerns. Would appreciate a re-review.

[lp:~psivaa/charms/trusty/jenkaas/install-plugins]

12. By Para Siva on 2015-06-16

Remove config file setup

13. By Para Siva on 2015-06-16

pyflakes

[Francis Ginther (fginther)]

Looks good.

review: Approve

[Joe Talbott (joetalbott)]

This looks good to me. One minor comment inline regarding os.path.exists()/mkdir() combination.

review: Approve

=== added directory 'files/plugins'
=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-16 08:34:49 +0000
+++ hooks/actions.py	2015-06-16 15:39:50 +0000
@@ -1,9 +1,13 @@
-import base64
+import glob
+import grp
 import os
+import pwd
+import shutil
 import subprocess
 
 from charmhelpers import fetch
 from charmhelpers.core import hookenv
+from charmhelpers.core.host import mkdir
 from charmhelpers.payload import execd
 
 SERVICE_NAME = 'jenkaas'
@@ -31,13 +35,19 @@
     subprocess.check_call(['dpkg', '-i', jenkins_deb])
 
 
-def update_config_file(service_name):
-    hookenv.log(
-        'Updating service configuration file: %s', SERVICE_CONFIGNAME)
-    config_content = base64.b64decode(config['config-file'])
-    config_path = os.path.join(_service_dir(), SERVICE_CONFIGNAME)
-    with open(config_path, 'w') as f:
-        f.write(config_content)
+def install_plugins(service_name):
+    hookenv.log('Installing plugins')
+    charm_plugins_dir = os.path.join(hookenv.charm_dir(), 'files/plugins')
+    plugins = glob.glob(os.path.join(charm_plugins_dir, '*.hpi'))
+    service_plugin_dir = os.path.join(_service_dir(), 'plugins')
+    if not os.path.exists(service_plugin_dir):
+        mkdir(service_plugin_dir, 'jenkins', 'jenkins', 0o755)
+    uid = pwd.getpwnam("jenkins").pw_uid
+    gid = grp.getgrnam("jenkins").gr_gid
+    for plugin in plugins:
+        shutil.copy2(plugin, service_plugin_dir)
+        os.chown(os.path.join(service_plugin_dir, os.path.basename(plugin)),
+                 uid, gid)
 
 
 def install_jenkins_dep_pkges(service_name):
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-16 08:11:39 +0000
+++ hooks/services.py	2015-06-16 15:39:50 +0000
@@ -15,7 +15,7 @@
                 actions.basenode,
                 actions.install_jenkins_dep_pkges,
                 actions.install_jenkins,
-                actions.update_config_file,
+                actions.install_plugins,
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/jenkaas.conf'),