Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/is-jenkins-charm into lp:ubuntu-ci-services-itself

  1. is-jenkins-charm
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 303
Merged at revision: 319
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/is-jenkins-charm
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 12 lines (+1/-1)
1 file modified
juju-deployer/lander.yaml.tmpl (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/is-jenkins-charm
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
Para Siva (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+209316@code.launchpad.net

Commit message

Switch to using the IS Jenkins charm

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Para Siva (psivaa) wrote :

I guess I could approve this. Used the IS charm in place for the ci-train one and it worked.

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

 merge approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/lander.yaml.tmpl'
2--- juju-deployer/lander.yaml.tmpl 2014-02-28 20:16:51 +0000
3+++ juju-deployer/lander.yaml.tmpl 2014-03-04 17:49:39 +0000
4@@ -17,7 +17,7 @@
5 wsgi_wsgi_file: lander.wsgi:app
6 lander-jenkins:
7 charm: jenkins
8- branch: lp:~ci-engineering-private/charms/precise/jenkins/ci-train@60
9+ branch: lp:~canonical-losas/canonical-is-charms/jenkins@30
10 constraints: "cpu-cores=2 mem=8 root-disk=8192M"
11 exposed: true
12 options:

Subscribers

People subscribed via source and target branches