Ubuntu CI Engine

Merge lp:~cjohnston/uci-engine/1328864-apt-update into lp:uci-engine

  1. 1328864-apt-update
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 564
Merged at revision: 566
Proposed branch: lp:~cjohnston/uci-engine/1328864-apt-update
Merge into: lp:uci-engine
Diff against target: 77 lines (+6/-6)
6 files modified
juju-deployer/branch-source-builder.yaml.tmpl (+1/-1)
juju-deployer/image-builder.yaml.tmpl (+1/-1)
juju-deployer/lander.yaml.tmpl (+1/-1)
juju-deployer/publisher.yaml.tmpl (+1/-1)
juju-deployer/test-runner.yaml.tmpl (+1/-1)
juju-deployer/ticket-system.yaml.tmpl (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/uci-engine/1328864-apt-update
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Celso Providelo (community) Approve
Review via email: mp+222850@code.launchpad.net

Commit message

Update rabbitmq-server revision number to fix apt-get install problem

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

FAILED: Continuous integration, rev:564
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/836/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
2--- juju-deployer/branch-source-builder.yaml.tmpl 2014-06-03 18:17:09 +0000
3+++ juju-deployer/branch-source-builder.yaml.tmpl 2014-06-11 17:31:54 +0000
4@@ -21,7 +21,7 @@
5 distros: trusty
6 architectures: amd64
7 ci-airline-rabbit:
8- branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
9+ branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
10 charm: rabbitmq
11 options:
12 management_plugin: true
13
14=== modified file 'juju-deployer/image-builder.yaml.tmpl'
15--- juju-deployer/image-builder.yaml.tmpl 2014-06-03 18:17:09 +0000
16+++ juju-deployer/image-builder.yaml.tmpl 2014-06-11 17:31:54 +0000
17@@ -17,7 +17,7 @@
18 install_keys: |
19 - ""
20 ci-airline-rabbit:
21- branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
22+ branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
23 charm: rabbitmq
24 options:
25 management_plugin: true
26
27=== modified file 'juju-deployer/lander.yaml.tmpl'
28--- juju-deployer/lander.yaml.tmpl 2014-06-03 18:17:09 +0000
29+++ juju-deployer/lander.yaml.tmpl 2014-06-11 17:31:54 +0000
30@@ -24,7 +24,7 @@
31 unit-config: include-base64://configs/unit_config.yaml
32 main: ./run-python ./lander/lander/run_worker.py --service-name ci-airline-ts-django --service-port 8080 --delay 10
33 ci-airline-rabbit:
34- branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
35+ branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
36 charm: rabbitmq
37 relations:
38 - ["ci-airline-lander:website", "ci-airline-lander-apache:website"]
39
40=== modified file 'juju-deployer/publisher.yaml.tmpl'
41--- juju-deployer/publisher.yaml.tmpl 2014-06-04 18:14:16 +0000
42+++ juju-deployer/publisher.yaml.tmpl 2014-06-11 17:31:54 +0000
43@@ -16,7 +16,7 @@
44 install_keys: |
45 - ""
46 ci-airline-rabbit:
47- branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
48+ branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
49 charm: rabbitmq
50 options:
51 management_plugin: true
52
53=== modified file 'juju-deployer/test-runner.yaml.tmpl'
54--- juju-deployer/test-runner.yaml.tmpl 2014-06-10 09:49:17 +0000
55+++ juju-deployer/test-runner.yaml.tmpl 2014-06-11 17:31:54 +0000
56@@ -16,7 +16,7 @@
57 install_keys: |
58 - ""
59 ci-airline-rabbit:
60- branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
61+ branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
62 charm: rabbitmq
63 options:
64 management_plugin: true
65
66=== modified file 'juju-deployer/ticket-system.yaml.tmpl'
67--- juju-deployer/ticket-system.yaml.tmpl 2014-06-09 16:19:19 +0000
68+++ juju-deployer/ticket-system.yaml.tmpl 2014-06-11 17:31:54 +0000
69@@ -31,7 +31,7 @@
70 options:
71 python_path: /srv/ci_airline_ts_django/development/ci-utils:/srv/ci_airline_ts_django/development/ticket_system
72 ci-airline-rabbit:
73- branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
74+ branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
75 charm: rabbitmq
76 options:
77 management_plugin: true

Subscribers

People subscribed via source and target branches