Merge lp://staging/~frankban/charms/oneiric/buildbot-master/upgrade-charm into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk

Proposed by Francesco Banconi
Status: Merged
Approved by: Graham Binns
Approved revision: 44
Merged at revision: 38
Proposed branch: lp://staging/~frankban/charms/oneiric/buildbot-master/upgrade-charm
Merge into: lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Diff against target: 252 lines (+78/-23)
6 files modified
hooks/buildbot-relation-broken (+1/-1)
hooks/config-changed (+1/-1)
hooks/helpers.py (+42/-10)
hooks/install (+3/-1)
revision (+0/-1)
tests/buildbot-master.test (+31/-9)
To merge this branch: bzr merge lp://staging/~frankban/charms/oneiric/buildbot-master/upgrade-charm
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+95535@code.staging.launchpad.net

Description of the change

== Changes ==

- Added upgrade-charm symlink
- Updated helpers (with some refactoring to functions running "juju status")
- Updated install hook: now it runs config-changed during charm upgrade
- Some changes in functional tests

The file helper.py is in sync with the one present in
lp:~frankban/charms/oneiric/buildbot-slave/upgrade-charm

Currently the upgrade-charm test does not work due to a bug of juju:
see https://bugs.launchpad.net/juju/+bug/941873

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)

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