Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplestreams handling cleanup #6148

Merged
merged 11 commits into from Sep 3, 2019

Conversation

@stgraber
Copy link
Member

commented Sep 3, 2019

This brings the simplestreams package in line with some of our other packages, makes it golint clean, updates some of the structs to match the server side data and also makes it so that all images that are suitable to LXD are now returned.

stgraber added 11 commits Sep 3, 2019
shared/simplestreams: Split out sortedImages
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Rename ssDefaultOS
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Split index/manifest out
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Rename index structs
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Rename product structs
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Rename SimpleStreamsFile
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Rename internal functions
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Remove dead code
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Make golint clean
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
tests: Add simplestreams to golint
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
shared/simplestreams: Record all images
Until now when both squashfs and tar.xz existed, only squashfs would
make it to the final index, making it impossible to query information
about the tar.xz image.

This fixes that, while still prefering squashfs in results.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

@brauner brauner merged commit d62d4da into lxc:master Sep 3, 2019

4 of 5 checks passed

Testsuite Test started
Details
Branch target Branch target is correct
Details
DCO All commits signed-off
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
You can’t perform that action at this time.