Merge lp://staging/~sinzui/juju-ci-tools/use-s3ci into lp://staging/juju-ci-tools
Proposed by
Curtis Hovey
| Status: | Merged |
|---|---|
| Merged at revision: | 1393 |
| Proposed branch: | lp://staging/~sinzui/juju-ci-tools/use-s3ci |
| Merge into: | lp://staging/juju-ci-tools |
| Diff against target: |
40 lines (+13/-10) 1 file modified
run-unit-tests (+13/-10) |
| To merge this branch: | bzr merge lp://staging/~sinzui/juju-ci-tools/use-s3ci |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Aaron Bentley (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Use s3ci.py in run-unit-tests because it honours proxies.
This update switches run-unit-tests to use s3ci.py instead of jujuci.py because the former honours proxies. This change is needed to run the s390x test from the actual host.
Also, I updted the rules to cleanup.
1. I added rules to delete gui* and pprof* which have filled up the disks of 3 machines in the last week.
2. I added || true to all the lines because there was a case of a pass that failed during cleanup possibly because another user owned the tmp files.
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.