Merge ~stgraber/simplestreams:master into simplestreams:master

Proposed by Stéphane Graber on 2020-04-20
Status: Merged
Approved by: Robert C Jennings on 2020-04-20
Approved revision: 368587ca888687d188cac62ad5ab440934cd87bf
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~stgraber/simplestreams:master
Merge into: simplestreams:master
Diff against target: 28 lines (+10/-0)
1 file modified
tools/make-test-data (+10/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2020-04-20
Robert C Jennings 2020-04-20 Approve on 2020-04-20
Review via email: mp+382597@code.launchpad.net

Commit message

Skip disk-kvm-img as unsuable under LXD

https://bugs.launchpad.net/cloud-images/+bug/1873809

To post a comment you must log in.
Robert C Jennings (rcj) wrote :

This looks good Stéphane, thank you.

review: Approve
review: Approve (continuous-integration)

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 5343959..0be6c6e 100755
3--- a/tools/make-test-data
4+++ b/tools/make-test-data
5@@ -310,6 +310,11 @@ def create_fake_file(prefix, item):
6 ('disk-kvm-img', '-disk-kvm.img'),
7 ('rootxz', '-root.tar.xz'),
8 ('squashfs', '.squashfs')):
9+
10+ # disk-kvm-img isn't currently bootable under LXD. LP: #1873809
11+ if name == "disk-kvm-img":
12+ continue
13+
14 if (ftype == "lxd.tar.xz" and
15 'combined_{}_sha256'.format(name) not in FAKE_DATA[ftype]):
16 rootpath = item['path'].replace("-lxd.tar.xz", extension)
17@@ -583,6 +588,11 @@ def create_image_data(query_tree, out_d, streamdir):
18 ('disk-kvm-img', '-disk-kvm.img'),
19 ('rootxz', '-root.tar.xz'),
20 ('squashfs', '.squashfs')):
21+
22+ # disk-kvm-img isn't currently bootable under LXD. LP: #1873809
23+ if name == "disk-kvm-img":
24+ continue
25+
26 root = lxd.replace('-lxd.tar.xz', extension)
27 combined = os.path.join(dirname, ','.join([lxd, root]))
28 value = get_cache_data(combined, 'sha256')

Subscribers

People subscribed via source and target branches