Merge lp://staging/~sinzui/juju-release-tools/exempt-aliased-ppc64-agents into lp://staging/juju-release-tools
Status: | Merged |
---|---|
Merged at revision: | 112 |
Proposed branch: | lp://staging/~sinzui/juju-release-tools/exempt-aliased-ppc64-agents |
Merge into: | lp://staging/juju-release-tools |
Diff against target: |
174 lines (+90/-7) 3 files modified
tests/test_validate_streams.py (+53/-6) tests/utils.py (+6/-0) validate_streams.py (+31/-1) |
To merge this branch: | bzr merge lp://staging/~sinzui/juju-release-tools/exempt-aliased-ppc64-agents |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Aaron Bentley (community) | Approve | ||
Review via email:
|
Description of the change
Exempt ppc64 aliases from the set of found_errors.
Juju will create aliases for ppc64 agents when it finds a matching ppc64el agent without a ppc64 counterpart. The ppc64 alias points the the ppc64el agent's path and has the same sha256. Testing of 1.21.x publication from devel to proposed to released revealed that 3 aliases were created, and validate_streams raised an error because they were unexpected.
This branch introduces reconcile_aliases() which will review the set of found_errors and remove ppc64 aliases. The feature is very specific at this time. We could expand this to accommodate other aliases. Juju could create aliases for win agents or amd64, 386, and armhf..
Looks good, except I think there's an unnecessary early return. See inline comments.