Merge lp:~cjohnston/ubuntu-ci-services-itself/1285302 into lp:ubuntu-ci-services-itself

[Chris Johnston]

Use the 'proper' jenkins charm, use jenkins provided in 12.04

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

I'd like to run a ticket through with this change just to make sure there aren't any job dependencies between the lander and jenkins. Starting this now.

[Francis Ginther (fginther)]

I've tested this with the losas charm and with the ci-train charm. Both fail unless the lts version is used. The problem is that both of these charms use the 'jenkins.model.JenkinsLocationConfiguration.xml' file to specify the IP address of the jenkins instance. This feature is not introduced until 1.494 [1], these charms are installing 1.424.6 when 'lts' is not used. When 'lts' is used, 1.532.2 jenkins is installed.

From my earlier jenkins charm experiments, I found that older versions of jenkins store the IP address in 'hudson.tasks.Mailer.xml'.

So, I see 2 options:
1) if we want to use these charms and the older jenkins version, we need to supply 'hudson.tasks.Mailer.xml' (maybe we can include this in the lander-jenkins charm).
2) package the 1.532.2 jenkins in our PPA.

I vote for 2 as long as it's not a dependency hell.

[1] http://javadoc.jenkins-ci.org/jenkins/model/JenkinsLocationConfiguration.html

review: Needs Fixing

[Andy Doan (doanac)]

On 02/28/2014 08:26 PM, Francis Ginther wrote:
> So, I see 2 options:
> 1) if we want to use these charms and the older jenkins version, we need to supply 'hudson.tasks.Mailer.xml' (maybe we can include this in the lander-jenkins charm).
> 2) package the 1.532.2 jenkins in our PPA.
>
> I vote for 2 as long as it's not a dependency hell.

Despite what people may think, I know very little of Jenkins. That said,
the newer version are always better for me. So I'd vote #2 also.

Unmerged revisions

293. By Chris Johnston on 2014-02-28

Use the 'proper' jenkins charm, use jenkins provided in 12.04

=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl	2014-02-19 00:02:21 +0000
+++ juju-deployer/lander.yaml.tmpl	2014-02-28 20:28:31 +0000
@@ -17,11 +17,10 @@
                 wsgi_wsgi_file: lander.wsgi:app
         lander-jenkins:
             charm: jenkins
-            branch: lp:~ci-engineering-private/charms/precise/jenkins/ci-train@60
+            branch: lp:~canonical-losas/canonical-is-charms/jenkins@30
             constraints: "cpu-cores=2 mem=8 root-disk=8192M"
             exposed: true
             options:
-                release: lts
                 tools: bzr
                 username: admin
                 password: admin