Merge lp:~cjwatson/launchpad-buildd/snapception into lp:launchpad-buildd
Status: | Merged |
---|---|
Merged at revision: | 327 |
Proposed branch: | lp:~cjwatson/launchpad-buildd/snapception |
Merge into: | lp:launchpad-buildd |
Diff against target: |
215 lines (+82/-9) 6 files modified
debian/changelog (+10/-0) lpbuildd/snap.py (+11/-0) lpbuildd/target/build_snap.py (+19/-1) lpbuildd/target/lxd.py (+9/-1) lpbuildd/target/tests/test_build_snap.py (+25/-4) lpbuildd/target/tests/test_lxd.py (+8/-3) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad-buildd/snapception |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+337126@code.launchpad.net |
Commit message
Allow optionally installing snapcraft as a snap.
Description of the change
This is controlled by an optional "channels" key in the build arguments, which takes a dict mapping snap names to channel names. At present anything other than "core" and "snapcraft" will cause a warning but otherwise be ignored, but I chose this structure so that it's reasonably easy to extend in future (e.g. for base snaps).
In the process, I noticed that snapd wasn't actually being started in LXD-based builds due to details of how the systemd services are started in snapd.postinst, which definitely wasn't intended and is probably a regression, so I fixed that as otherwise "snap install" obviously doesn't work.