Merge lp://staging/~ev/ubuntu-ci-services-itself/phase0-ppa into lp://staging/ubuntu-ci-services-itself

Proposed by Evan
Status: Merged
Approved by: Chris Johnston
Approved revision: 277
Merged at revision: 290
Proposed branch: lp://staging/~ev/ubuntu-ci-services-itself/phase0-ppa
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 345 lines (+249/-7)
9 files modified
charms/precise/rabbitmq-worker/Makefile (+24/-0)
charms/precise/rabbitmq-worker/charm-helpers.yaml (+4/-0)
charms/precise/rabbitmq-worker/cm.py (+172/-0)
charms/precise/rabbitmq-worker/config-manager.txt (+5/-0)
charms/precise/rabbitmq-worker/config.yaml (+25/-0)
charms/precise/rabbitmq-worker/hooks/hooks.py (+4/-1)
juju-deployer/branch-source-builder.yaml.tmpl (+5/-2)
juju-deployer/image-builder.yaml.tmpl (+5/-2)
juju-deployer/test-runner.yaml.tmpl (+5/-2)
To merge this branch: bzr merge lp://staging/~ev/ubuntu-ci-services-itself/phase0-ppa
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+208811@code.staging.launchpad.net

Commit message

- Bring charmhelpers into the rabbitmq-worker charm.
- Use PPA versions of the dependencies for the bsb, image builder, and test runner components.

Description of the change

This kills the remaining installs of pip packages to the production deployment. This ensures that if pypi goes down or the egg has a flaky install routine, we're still able to get through a deployment.

By using a "release" PPA, we ensure a predictable and reproducible environment by sticking to the same dependency versions unless we explicitly upload a new one.

- Bring charmhelpers into the rabbitmq-worker charm.
- Use PPA versions of the dependencies for the bsb, image builder, and test runner components.

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

FAILED: Continuous integration, rev:277
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ev/ubuntu-ci-services-itself/phase0-ppa/+merge/208811/+edit-commit-message

http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/250/
Executed test runs:

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

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

makes me so happy.

NOTE: we have one pip dependency still lurking here:

 http://bazaar.launchpad.net/~ev/ubuntu-ci-services-itself/phase0-ppa/view/head:/charms/precise/restish/hooks/hooks.py#L93

but we can probably treat that in a separate MP

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: