Merge lp://staging/~sinzui/juju-ci-tools/match-job-name into lp://staging/juju-ci-tools
Proposed by
Curtis Hovey
| Status: | Merged |
|---|---|
| Merged at revision: | 1984 |
| Proposed branch: | lp://staging/~sinzui/juju-ci-tools/match-job-name |
| Merge into: | lp://staging/juju-ci-tools |
| Diff against target: |
30 lines (+6/-1) 2 files modified
s3ci.py (+4/-0) tests/test_s3ci.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~sinzui/juju-ci-tools/match-job-name |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Christopher Lee (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Match the exact job name.
the assemble-stream job fails because s3ci.py assumes it got an exact match of the job name. Yesterday I added 1-8 counterpart jobs for all the build agent jobs. s3ci.py is confused by build-centos and build-centos-1-8. It looks for "/build-" to follow the exact jobs name. It errors when it does not find a build number in "-1-8/build" because
the fragment does not start with "/build-"
My fix just checks for a match, No match means the job name is not an exact match. We had a good test; adding the case reproduced the problem. I added logging to see that s3ci/py found.
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
LGTM