Ubuntu CI Services

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

  1. 1288947
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 340
Merged at revision: 340
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/1288947
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/1288947
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
Andy Doan (community) Approve
Review via email: mp+210028@code.launchpad.net

Commit message

Switch back to the CI Train jenkins charm

Description of the change

Since the IS Jenkins charm appears to be causing us issues, lets switch back to the ci train charm.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
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-03-06 14:13:05 +0000
3+++ juju-deployer/lander.yaml.tmpl 2014-03-07 21:47:42 +0000
4@@ -21,7 +21,7 @@
5 wsgi_wsgi_file: lander.wsgi:app
6 lander-jenkins:
7 charm: jenkins
8- branch: lp:~canonical-losas/canonical-is-charms/jenkins@30
9+ branch: lp:~ci-engineering-private/charms/precise/jenkins/ci-train@60
10 constraints: "cpu-cores=2 mem=8 root-disk=8192M"
11 exposed: true
12 options:

Subscribers

People subscribed via source and target branches