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
=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
--- juju-deployer/branch-source-builder.yaml.tmpl 2014-06-03 18:17:09 +0000
+++ juju-deployer/branch-source-builder.yaml.tmpl 2014-06-11 17:31:54 +0000
@@ -21,7 +21,7 @@
21 distros: trusty21 distros: trusty
22 architectures: amd6422 architectures: amd64
23 ci-airline-rabbit:23 ci-airline-rabbit:
24 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@4624 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
25 charm: rabbitmq25 charm: rabbitmq
26 options:26 options:
27 management_plugin: true27 management_plugin: true
2828
=== modified file 'juju-deployer/image-builder.yaml.tmpl'
--- juju-deployer/image-builder.yaml.tmpl 2014-06-03 18:17:09 +0000
+++ juju-deployer/image-builder.yaml.tmpl 2014-06-11 17:31:54 +0000
@@ -17,7 +17,7 @@
17 install_keys: |17 install_keys: |
18 - ""18 - ""
19 ci-airline-rabbit:19 ci-airline-rabbit:
20 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@4620 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
21 charm: rabbitmq21 charm: rabbitmq
22 options:22 options:
23 management_plugin: true23 management_plugin: true
2424
=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl 2014-06-03 18:17:09 +0000
+++ juju-deployer/lander.yaml.tmpl 2014-06-11 17:31:54 +0000
@@ -24,7 +24,7 @@
24 unit-config: include-base64://configs/unit_config.yaml24 unit-config: include-base64://configs/unit_config.yaml
25 main: ./run-python ./lander/lander/run_worker.py --service-name ci-airline-ts-django --service-port 8080 --delay 1025 main: ./run-python ./lander/lander/run_worker.py --service-name ci-airline-ts-django --service-port 8080 --delay 10
26 ci-airline-rabbit:26 ci-airline-rabbit:
27 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@4627 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
28 charm: rabbitmq28 charm: rabbitmq
29 relations:29 relations:
30 - ["ci-airline-lander:website", "ci-airline-lander-apache:website"]30 - ["ci-airline-lander:website", "ci-airline-lander-apache:website"]
3131
=== modified file 'juju-deployer/publisher.yaml.tmpl'
--- juju-deployer/publisher.yaml.tmpl 2014-06-04 18:14:16 +0000
+++ juju-deployer/publisher.yaml.tmpl 2014-06-11 17:31:54 +0000
@@ -16,7 +16,7 @@
16 install_keys: |16 install_keys: |
17 - ""17 - ""
18 ci-airline-rabbit:18 ci-airline-rabbit:
19 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@4619 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
20 charm: rabbitmq20 charm: rabbitmq
21 options:21 options:
22 management_plugin: true22 management_plugin: true
2323
=== modified file 'juju-deployer/test-runner.yaml.tmpl'
--- juju-deployer/test-runner.yaml.tmpl 2014-06-10 09:49:17 +0000
+++ juju-deployer/test-runner.yaml.tmpl 2014-06-11 17:31:54 +0000
@@ -16,7 +16,7 @@
16 install_keys: |16 install_keys: |
17 - ""17 - ""
18 ci-airline-rabbit:18 ci-airline-rabbit:
19 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@4619 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
20 charm: rabbitmq20 charm: rabbitmq
21 options:21 options:
22 management_plugin: true22 management_plugin: true
2323
=== modified file 'juju-deployer/ticket-system.yaml.tmpl'
--- juju-deployer/ticket-system.yaml.tmpl 2014-06-09 16:19:19 +0000
+++ juju-deployer/ticket-system.yaml.tmpl 2014-06-11 17:31:54 +0000
@@ -31,7 +31,7 @@
31 options:31 options:
32 python_path: /srv/ci_airline_ts_django/development/ci-utils:/srv/ci_airline_ts_django/development/ticket_system32 python_path: /srv/ci_airline_ts_django/development/ci-utils:/srv/ci_airline_ts_django/development/ticket_system
33 ci-airline-rabbit:33 ci-airline-rabbit:
34 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@4634 branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@47
35 charm: rabbitmq35 charm: rabbitmq
36 options:36 options:
37 management_plugin: true37 management_plugin: true

Subscribers

People subscribed via source and target branches