Merge lp:~smoser/maas-images/trunk.lp1665376 into lp:maas-images
Status: | Merged |
---|---|
Merged at revision: | 355 |
Proposed branch: | lp:~smoser/maas-images/trunk.lp1665376 |
Merge into: | lp:maas-images |
Diff against target: |
352 lines (+158/-68) 2 files modified
meph2/netinst.py (+6/-5) tests/unittests/file_item_data.json (+152/-63) |
To merge this branch: | bzr merge lp:~smoser/maas-images/trunk.lp1665376 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Watkins (community) | Approve | ||
maintainers of maas images | Pending | ||
Review via email: mp+317499@code.launchpad.net |
Commit message
netinst: support d-i hwe kernels from rolling hwe
For LTS releases prior to xenial, the hardware enablement kernel was
specifically tied to a subsequent release. Thus, for trusty we had
d-i paths like:
device-
wily-device-
xenial-
netboot/
wily-netboot/
xenial-
generic-
wily-generic-
xenial-
With xenial, the hwe kernel is not specifically tied to a release, but
rather "rolls". So we have new paths that look like this:
hwe-device-
hwe-netboot/
hwe-generic-
For those the 'kernel release' data is set to simply "hwe".
The unit test data tests/unittests
and sorted with the following:
$ cat sort-json.py
import json, sys
with open(sys.argv[1], "rb") as fp:
data = json.loads(
with open(sys.argv[1], "wb") as fp:
fp.
$ sort-json.py tests/unittests
This passes both a dry run of all supported releases: netboot- mirror --dry-run -vvv out.d
./bin/
and actual download of all xenial:
./bin/ netboot- mirror -vvv --releases=xenial out.d