Merge ~cjwatson/launchpad:issue-private-archive-macaroons into launchpad:master
Proposed by
Colin Watson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Colin Watson | ||||
Approved revision: | c7054367d530f8d2188f5330a9ebbf0163ce88fe | ||||
Merge reported by: | Otto Co-Pilot | ||||
Merged at revision: | not available | ||||
Proposed branch: | ~cjwatson/launchpad:issue-private-archive-macaroons | ||||
Merge into: | launchpad:master | ||||
Prerequisite: | ~cjwatson/launchpad:get-sources-list-accept-behaviour | ||||
Diff against target: |
402 lines (+147/-24) 10 files modified
lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py (+9/-0) lib/lp/buildmaster/model/buildfarmjobbehaviour.py (+4/-0) lib/lp/oci/model/ocirecipebuildbehaviour.py (+9/-5) lib/lp/snappy/model/snapbuildbehaviour.py (+8/-4) lib/lp/snappy/tests/test_snapbuildbehaviour.py (+55/-0) lib/lp/soyuz/adapters/archivedependencies.py (+11/-8) lib/lp/soyuz/model/binarypackagebuildbehaviour.py (+10/-0) lib/lp/soyuz/model/livefsbuildbehaviour.py (+9/-0) lib/lp/soyuz/tests/test_archive.py (+29/-7) system-packages.txt (+3/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ioana Lasc (community) | Approve | ||
Review via email: mp+401323@code.launchpad.net |
Commit message
Dispatch sources.list entries for private archives using macaroons
Description of the change
This allows snap base archive dependencies on private archives to work (for 16.04 ESM), and also takes a significant step towards abolishing `Archive.
The old buildd secret is still used in the file map passed to builders to fetch the source package for binary package builds in private archives, so it can't yet be removed entirely.
To post a comment you must log in.
LGTM