Merge lp:~psivaa/uci-engine/lander-jenkins-gpg-key-import into lp:uci-engine/mthood

[Para Siva]

GPG import into lander jenkins installation. This also includes 'proper' fixes of parameterized plugin installation. (The plugin is confirmed to be installed now )

GPG import into lander jenkins installation. This also includes 'proper' fixes of parameterized plugin installation. (The plugin is confirmed to be installed now ) Apologies for missing it earlier.

[Andy Doan (doanac)]

looks awfully familiar :)

review: Approve

[Para Siva (psivaa)]

Thanks. yes. still i missed it in the first MP :)

=== modified file 'charms/precise/lander-jenkins/config.yaml'
--- charms/precise/lander-jenkins/config.yaml	2014-05-16 18:32:52 +0000
+++ charms/precise/lander-jenkins/config.yaml	2014-05-20 12:42:25 +0000
@@ -64,10 +64,14 @@
     type: string
     default: "https://updates.jenkins-ci.org/"
     description: Site to download plugin .hpi files from.
-  proxy_url:
+  proxy-url:
     type: string
     default: ""
     description: The http proxy url for private clouds.
+  ppa-gpg-key:
+    type: string
+    default: ""
+    description: GPG key fingerprint for the PPA
   main:
     type: string
     default: ""
 
=== modified file 'charms/precise/lander-jenkins/hooks/hooks.py'
--- charms/precise/lander-jenkins/hooks/hooks.py	2014-05-16 19:14:04 +0000
+++ charms/precise/lander-jenkins/hooks/hooks.py	2014-05-20 12:42:25 +0000
@@ -161,13 +161,13 @@
         juju_info('Installing {} from {}'.format(plugin_file, url))
         plugin_file = os.path.join(JENKINS_HOME, 'plugins', plugin_file)
 
-        if config['proxy_url']:
-            cmd = ['https_proxy=%s' % config['proxy_url'], 'wget',
-                   '-O', plugin_file, url]
-            juju_info('Proxy {} is used'.format(config['proxy_url']))
+        if config['proxy-url']:
+            juju_info('Proxy {} is used'.format(config['proxy-url']))
+            cmd = ('https_proxy=%s http_proxy=%s wget -O %s %s' %
+                  (config['proxy-url'], config['proxy-url'], plugin_file, url))
         else:
-            cmd = ['wget', '-O', plugin_file, url]
-
+            cmd = ('wget -O %s %s' % (plugin_file, url))
+        juju_info('Command {} is used'.format(cmd))
         subprocess.check_call(cmd, shell=True)
         cmd = ['chown', '-R', '{}.{}'.format(JENKINS_USER, JENKINS_GROUP),
                plugin_file]
@@ -269,11 +269,23 @@
         subprocess.check_call(['/sbin/start', _service_name(config)])
 
 
+def import_ppa_keys(config):
+    cmd = ['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com',
+           '--recv-keys', config['ppa-gpg-key']]
+    try:
+        subprocess.check_call(cmd)
+    except:
+        juju_log(MSG_ERROR, "Error importing repo key")
+
+
 def config_changed(config):
     juju_info("Config: %s" % config)
-    if config['proxy_url']:
-        juju_info('Setting up apt with {}'.format(config['proxy_url']))
+    if config['proxy-url']:
+        juju_info('Setting up apt with {}'.format(config['proxy-url']))
         setup_apt_proxy(config)
+    if config['ppa-gpg-key']:
+        juju_info('Importing key for {}'.format(config['ppa-gpg-key']))
+        import_ppa_keys(config)
     add_dependencies(config)
     create_jobs(config)
     create_user(config)
@@ -352,7 +364,7 @@
 
 
 def setup_apt_proxy(config):
-    proxy_url = config['proxy_url']
+    proxy_url = config['proxy-url']
     apt_conf = textwrap.dedent("""\
         Acquire::http::proxy "%s";
         Acquire::https::proxy "%s";
 
=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl	2014-05-16 18:32:52 +0000
+++ juju-deployer/lander.yaml.tmpl	2014-05-20 12:42:25 +0000
@@ -35,7 +35,8 @@
                 vcs: ${CI_CODE_SOURCE}
                 branch: ${CI_BRANCH}
                 tarball: ${CI_PAYLOAD_URL}
-                proxy_url: ${CI_PRIVATE_HTTP_PROXY}
+                proxy-url: ${CI_PRIVATE_HTTP_PROXY}
+                ppa-gpg-key: ${CI_PPA_GPG_KEY}
                 bot_username: lander-bot
                 bot_password: lander-bot
                 sources: ${CI_PPA}