Merge lp://staging/~sinzui/juju-ci-tools/local-tarball into lp://staging/juju-ci-tools
| Status: | Merged |
|---|---|
| Merged at revision: | 523 |
| Proposed branch: | lp://staging/~sinzui/juju-ci-tools/local-tarball |
| Merge into: | lp://staging/juju-ci-tools |
| Diff against target: |
65 lines (+31/-16) 1 file modified
run-unit-tests (+31/-16) |
| To merge this branch: | bzr merge lp://staging/~sinzui/juju-ci-tools/local-tarball |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Aaron Bentley (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch adds support for run-unit-tests --local tarball.
I copied another rule from run-unit-tests to git-merge-juju to help it deal with broken mirrors. I want that job to call this script so that there is one right place to put these rules. I believe the git-merge-juju needs to pass the tarball it built to the test instance. The job does not need a build_revision or buildvars.
The changes include:
1. A loop to parse the trailing --options.
2. The --local tarfile option to pass the built tarfile
3. An IS_LOCAL == false condition guards the block that works with build_revision, buildvars, and the build-revision tarfile
4. I took this opportunity change rules to download the tarfile from juju-ci.vapour.ws, as it was pointed out that checking the local file system wont work on the slaves (which I want to use as builders)
| Curtis Hovey (sinzui) wrote | # |
I think the git-merge-job would look like this http://