Merge lp://qastaging/~smoser/simplestreams/trunk.yakkety-streams into lp://qastaging/simplestreams

Proposed by Scott Moser
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
Reviewer Review Type Date Requested Status
Dan Watkins (community) Approve
simplestreams-dev Pending
Review via email: mp+294839@code.qastaging.launchpad.net

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/compare-test-data
will output a 'diff' from old to new list of files indexed.

To post a comment you must log in.
434. By Scott Moser

add tools/compare-test-data for comparing generate data output

This just adds a tool that makes it easier to compare the result
of your changes to 'make exdata'.

Revision history for this message
Scott Moser (smoser) wrote :

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.

Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM, but we'll need to hold off on using this in production until we've cleared the CVE that's currently working its way through.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: