Merge ~stgraber/simplestreams:master into simplestreams:master

Proposed by Stéphane Graber on 2019-11-13
Status: Merged
Approved by: Robert C Jennings on 2019-12-03
Approved revision: 9a03f713f554b2563bc936842e167d325f7d8e17
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~stgraber/simplestreams:master
Merge into: simplestreams:master
Diff against target: 23 lines (+3/-0)
1 file modified
tools/make-test-data (+3/-0)
Reviewer Review Type Date Requested Status
Robert C Jennings 2019-11-13 Approve on 2019-12-03
Server Team CI bot continuous-integration Approve on 2019-11-13
Review via email: mp+375507@code.launchpad.net

Commit message

Add combined-disk-kvm-img_sha256 to download.json

To post a comment you must log in.
Stéphane Graber (stgraber) wrote :

Tested it with "exdata/fake", it will need an update to the server side hash generation logic too similar to what was done last time around.

review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
Stéphane Graber (stgraber) wrote :

Can we get this merged?

Stéphane Graber (stgraber) wrote :

Am I missing something?

This looks green to me, pinged here a week ago and yesterday on IRC.

Feels like a pretty simple change that we'll need to make the LXD ubuntu VM experience quite a bit better. As we need this merged and then a bunch of time to get new images with this field set, it'd be great if someone could review and merge it.

Robert C Jennings (rcj) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/make-test-data b/tools/make-test-data
2index a1e183d..f0b2523 100755
3--- a/tools/make-test-data
4+++ b/tools/make-test-data
5@@ -298,8 +298,10 @@ def create_fake_file(prefix, item):
6 # - combined_sha256 and combined_rootxz_sha256 for the -root.tar.gz
7 # - combined_squashfs_sha256 for the squashfs
8 # - combined_disk1-img_sha256 for the img
9+ # - combined_disk-kvm-img_sha256 for the img
10 ftype = item['ftype']
11 for name, extension in (('disk1-img', '.img'),
12+ ('disk-kvm-img', '.img'),
13 ('rootxz', '-root.tar.xz'),
14 ('squashfs', '.squashfs')):
15 if (ftype == "lxd.tar.xz" and
16@@ -570,6 +572,7 @@ def create_image_data(query_tree, out_d, streamdir):
17
18 # find calculated combined checksums
19 for name, extension in (('disk1-img', '.img'),
20+ ('disk-kvm-img', '.img'),
21 ('rootxz', '-root.tar.xz'),
22 ('squashfs', '.squashfs')):
23 root = lxd.replace('-lxd.tar.xz', extension)

Subscribers

People subscribed via source and target branches