Juju Charms Collection
buildbot-master package

Merge lp://staging/~frankban/charms/oneiric/buildbot-master/02-13 into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk

  1. Oneiric (11.10)
  2. 02-13
  3. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Approved by: Francesco Banconi
Approved revision: 32
Merged at revision: 30
Proposed branch: lp://staging/~frankban/charms/oneiric/buildbot-master/02-13
Merge into: lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Diff against target: 202 lines (+81/-31)
5 files modified
hooks/buildbot-relation-broken (+56/-0)
hooks/buildbot-relation-changed (+15/-25)
hooks/config-changed (+0/-4)
hooks/helpers.py (+5/-2)
hooks/install (+5/-0)
To merge this branch: bzr merge lp://staging/~frankban/charms/oneiric/buildbot-master/02-13
Reviewer Review Type Date Requested Status
Benji York (community) code Approve
Review via email: mp+92812@code.staging.launchpad.net

Description of the change

*Changes*:

- Relation broken: the master correctly reconfigures buildbot when the relationship with a slave is broken (e.g. when you call remove-relation or destroy-service).

- The JSON file containing slaves info is now initialized in the `install` hook: cleaning up things in `install` is useful since we do not have a destroy hook.

- The helper function `wait_for_page_contents` now accepts a callable as a validator to break the inner loop (this is used in buildbot-slave tests).

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

Looks good.

review: Approve (code)
Revision history for this message
Francesco Banconi (frankban) wrote :

Thanks Benji.

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