Merge lp://qastaging/~doanac/uci-engine/rabbit-layout into lp://qastaging/uci-engine
Proposed by
Andy Doan
Status: | Merged |
---|---|
Approved by: | Andy Doan |
Approved revision: | 661 |
Merged at revision: | 666 |
Proposed branch: | lp://qastaging/~doanac/uci-engine/rabbit-layout |
Merge into: | lp://qastaging/uci-engine |
Prerequisite: | lp://qastaging/~doanac/uci-engine/runner-unit-config |
Diff against target: |
461 lines (+186/-54) 9 files modified
charms/precise/rabbitmq-worker/charm-helpers.yaml (+1/-0) charms/precise/rabbitmq-worker/config.yaml (+6/-1) charms/precise/rabbitmq-worker/hooks/hooks.py (+117/-36) charms/precise/rabbitmq-worker/unit_tests/test_hooks.py (+51/-8) ci-utils/ci_utils/amqp_worker.py (+3/-5) juju-deployer/branch-source-builder.yaml.tmpl (+2/-1) juju-deployer/image-builder.yaml.tmpl (+2/-1) juju-deployer/publisher.yaml.tmpl (+2/-1) juju-deployer/test-runner.yaml.tmpl (+2/-1) |
To merge this branch: | bzr merge lp://qastaging/~doanac/uci-engine/rabbit-layout |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Celso Providelo (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
rabbit charm: convert over to the new code layout scheme
mostly copy/paste from the lander change
Description of the change
convert the rabbit workers to use the new code layout
i actually had a bug (revno 661) and was able to deploy a fix by just running "deploy.py --upgrade"!
To post a comment you must log in.
PASSED: Continuous integration, rev:661 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1039/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/1039/ rebuild
http://