Merge ~stgraber/simplestreams:master into simplestreams:master

[Stéphane Graber]

Skip disk-kvm-img as unsuable under LXD

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

[Robert C Jennings (rcj)]

This looks good Stéphane, thank you.

review: Approve

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/tools/make-test-data b/tools/make-test-data
index 5343959..0be6c6e 100755
--- a/tools/make-test-data
+++ b/tools/make-test-data
@@ -310,6 +310,11 @@ def create_fake_file(prefix, item):
                             ('disk-kvm-img', '-disk-kvm.img'),
                             ('rootxz', '-root.tar.xz'),
                             ('squashfs', '.squashfs')):
+
+        # disk-kvm-img isn't currently bootable under LXD. LP: #1873809
+        if name == "disk-kvm-img":
+            continue
+
         if (ftype == "lxd.tar.xz" and
                 'combined_{}_sha256'.format(name) not in FAKE_DATA[ftype]):
             rootpath = item['path'].replace("-lxd.tar.xz", extension)
@@ -583,6 +588,11 @@ def create_image_data(query_tree, out_d, streamdir):
                                     ('disk-kvm-img', '-disk-kvm.img'),
                                     ('rootxz', '-root.tar.xz'),
                                     ('squashfs', '.squashfs')):
+
+                # disk-kvm-img isn't currently bootable under LXD. LP: #1873809
+                if name == "disk-kvm-img":
+                    continue
+
                 root = lxd.replace('-lxd.tar.xz', extension)
                 combined = os.path.join(dirname, ','.join([lxd, root]))
                 value = get_cache_data(combined, 'sha256')