Merge lp:~fginther/charms/trusty/jenkaas-slave/install-jenkins-slave into lp:~canonical-ci-engineering/charms/trusty/jenkaas-slave/trunk

[Francis Ginther]

Add installation of .deb packages and dependencies.

Add installation of .deb packages and dependencies.

The charm is very basic so far, this just adds the installation of the jenkins-slave*.deb files which need to be put in place by the spec.

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-12 22:37:23 +0000
+++ hooks/actions.py	2015-06-15 15:02:20 +0000
@@ -1,10 +1,20 @@
+import glob
 import os
+import subprocess
 
+from charmhelpers import fetch
 from charmhelpers.core import hookenv
 from charmhelpers.payload import execd
 
 # Keep the same service name that the jenkins-slave package uses.
 SERVICE_NAME = 'jenkins-slave'
+REQUIRED_PACKAGES = [
+    'adduser',
+    'default-jre-headless',
+    # jenkins-slave requires default-jre-headless | java6-runtime-headless
+    #'java6-runtime-headless',
+    'upstart-job',
+]
 
 config = hookenv.config()
 
@@ -20,5 +30,19 @@
     execd.execd_preinstall()
 
 
+def install_service_dependencies(service_name):
+    hookenv.log('Installing service dependencies')
+    fetch.configure_sources(update=True)
+    fetch.apt_install(REQUIRED_PACKAGES, fatal=True)
+
+
+def install_service_packages(service_name):
+    files_dir = os.path.join(hookenv.charm_dir(), 'files')
+    packages = glob.glob(os.path.join(files_dir, '*.deb'))
+    hookenv.log('Installing service packages: {}'.format(', '.join(packages)))
+    for package in packages:
+        subprocess.check_call(['dpkg', '-i', package])
+
+
 def log_start(service_name):
     hookenv.log('Starting service {}'.format(SERVICE_NAME))

=== added symlink 'hooks/config-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/install'
=== target is u'hooks.py'
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-12 22:37:23 +0000
+++ hooks/services.py	2015-06-15 15:02:20 +0000
@@ -12,6 +12,8 @@
             'required_data': [config],
             'data_ready': [
                 actions.basenode,
+                actions.install_service_dependencies,
+                actions.install_service_packages,
                 actions.log_start,
             ],
         },

=== added symlink 'hooks/start'
=== target is u'hooks.py'
=== added symlink 'hooks/stop'
=== target is u'hooks.py'
=== added symlink 'hooks/upgrade-charm'
=== target is u'hooks.py'