Merge lp://staging/~sinzui/juju-ci-tools/easy-update into lp://staging/juju-ci-tools
Proposed by
Curtis Hovey
| Status: | Merged |
|---|---|
| Merged at revision: | 795 |
| Proposed branch: | lp://staging/~sinzui/juju-ci-tools/easy-update |
| Merge into: | lp://staging/juju-ci-tools |
| Diff against target: |
69 lines (+2/-15) 2 files modified
Makefile (+2/-1) update-jenkins-branches.bash (+0/-14) |
| To merge this branch: | bzr merge lp://staging/~sinzui/juju-ci-tools/easy-update |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John George (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Always update juju on the Jenkins master and slaves.
This branch follows up from a discussion on Last December to always update juju. There is no reason for an extra option. The addition are in the new Makefile. Note the other changes
* -qq to suppress the update noise, errors are still show.
* The toggling of -e/+e looks wrong. I don't think it is necessary because the call to update_jenkins() uses || to report that host wasn't updated
* I removed the old option.
I pondered removing the --cloud-city option. It can only be run from a machine with a logged in user with access to the private branch, so I elected to keep it an option.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good.