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

[Para Siva]

Resubmitting with proxy setup to install the plugin and other pkges from the ppa.

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

[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

[Para Siva (psivaa)]

Thanks for that catch. Missed it. Was relying more on deploy.py for the install errors. Investigating this also spotted other issues. Hence using proxy to install the plugin from the jenkins-ci.org and to install other pkges from the ppa

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

414. By Para Siva on 2014-05-16

Log about proxy only if proxy is available

[Andy Doan (doanac)]

review: Approve

[Francis Ginther (fginther)]

I wonder if we can apply this same approach to acquire the debs in the jenkins charm as well... Just something to consider if we need to revisit that charm.

review: Approve

[Para Siva (psivaa)]

Yes, Thanks. That's in the list to fix. But for now in order to move forward I'm using the debs in the charm version.

=== modified file 'charms/precise/lander-jenkins/config.yaml'
--- charms/precise/lander-jenkins/config.yaml	2014-03-10 22:25:00 +0000
+++ charms/precise/lander-jenkins/config.yaml	2014-05-16 19:14:17 +0000
@@ -64,6 +64,10 @@
     type: string
     default: "https://updates.jenkins-ci.org/"
     description: Site to download plugin .hpi files from.
+  proxy_url:
+    type: string
+    default: ""
+    description: The http proxy url for private clouds.
   main:
     type: string
     default: ""

=== 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-16 19:14:17 +0000
@@ -160,8 +160,15 @@
             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)
+
+        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']))
+        else:
+            cmd = ['wget', '-O', plugin_file, url]
+
+        subprocess.check_call(cmd, shell=True)
         cmd = ['chown', '-R', '{}.{}'.format(JENKINS_USER, JENKINS_GROUP),
                plugin_file]
         subprocess.check_call(cmd)
@@ -264,6 +271,9 @@
 
 def config_changed(config):
     juju_info("Config: %s" % config)
+    if config['proxy_url']:
+        juju_info('Setting up apt with {}'.format(config['proxy_url']))
+        setup_apt_proxy(config)
     add_dependencies(config)
     create_jobs(config)
     create_user(config)
@@ -341,6 +351,18 @@
     })
 
 
+def setup_apt_proxy(config):
+    proxy_url = config['proxy_url']
+    apt_conf = textwrap.dedent("""\
+        Acquire::http::proxy "%s";
+        Acquire::https::proxy "%s";
+        Acquire::HTTP::PROXY "%s";
+        Acquire::HTTPS::PROXY "%s";
+        """ % (proxy_url, proxy_url, proxy_url, proxy_url))
+    with open('/etc/apt/apt.conf.d/95proxies', 'w') as f:
+        f.write(apt_conf)
+
+
 def amqp_relation_changed(config):
     with open(os.path.join(_service_dir(config), 'amqp_config.py'), 'w') as f:
         f.write('# DO NOT EDIT. Generated by lander-jenkins charm hook\n')

=== 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-16 19:14:17 +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:
@@ -35,6 +35,7 @@
                 vcs: ${CI_CODE_SOURCE}
                 branch: ${CI_BRANCH}
                 tarball: ${CI_PAYLOAD_URL}
+                proxy_url: ${CI_PRIVATE_HTTP_PROXY}
                 bot_username: lander-bot
                 bot_password: lander-bot
                 sources: ${CI_PPA}