Merge lp://qastaging/~smoser/simplestreams/trunk.yakkety-streams into lp://qastaging/simplestreams
Status: | Merged |
---|---|
Merged at revision: | 431 |
Proposed branch: | lp://qastaging/~smoser/simplestreams/trunk.yakkety-streams |
Merge into: | lp://qastaging/simplestreams |
Diff against target: |
285 lines (+174/-10) 4 files modified
tools/compare-test-data (+101/-0) tools/make-test-data (+8/-1) tools/toolutil.py (+33/-8) tools/ubuntu_versions.py (+32/-1) |
To merge this branch: | bzr merge lp://qastaging/~smoser/simplestreams/trunk.yakkety-streams |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Watkins (community) | Approve | ||
simplestreams-dev | Pending | ||
Review via email:
|
Commit message
support stream output for yakkety builds
For yakkety builds:
- yakkety build output renames the -disk1.img file to .img
but stream data should maintain -disk1.img as the ftype and item key.
- -root.tar.gz and -root.tar.xz files are not produced
- squashfs images are available (and also were available partially through
xenial)
As a cleanup, we a helper to ubuntu_versions to compare versions more
directly. String compare was less useful in some cases and also would end
up breaking after 'z' because whatever release comes after z would string
sort to < z.
This also adds a simple tool for comparing two trees output of 'make exdata'.
./tools/
will output a 'diff' from old to new list of files indexed.
compared to roberts mp at https:/ /code.launchpad .net/~rcj/ simplestreams/ yakkety/ +merge/ 294684 , this merge does not add the indexing of vagrant.box and disk1.vmdk. Those can be added separately. This does handle the adding of squashfs and .img files as they're required for some things.