Merge ~stgraber/simplestreams:master into simplestreams:master

[Stéphane Graber]

Re-enable disk-kvm images (used on focal/groovy).

The kernel has now been updated to boot properly on LXD.

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

PASSED: Continuous integration, rev:d5dfebc5e9062d7ef98027b32d36ecfdb809d4fa
https://jenkins.ubuntu.com/server/job/simplestreams-ci/138/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/138/
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/138/
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/138/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/138//rebuild

review: Approve (continuous-integration)

[Paride Legovini (paride)]

LGTM!

review: Approve

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

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/simplestreams-autoland-test/60/
Executed test runs:
    None: https://jenkins.ubuntu.com/server/job/admin-lp-git-autoland/1020/

review: Needs Fixing (continuous-integration)

diff --git a/tools/make-test-data b/tools/make-test-data
index 3e0d52c..a287dab 100755
--- a/tools/make-test-data
+++ b/tools/make-test-data
@@ -312,11 +312,6 @@ 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)
@@ -591,11 +586,6 @@ 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')