From 5ed954bcf5c34aaeca8d06ec87e4d69e9ad6cc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Wed, 29 Sep 2021 16:07:43 +0200 Subject: [PATCH] distro/rhel90: use qcow2 compat 1.1 for qcows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no reason to use 0.10 since we don't need to support running this image on RHEL 6 anymore. See https://bugzilla.redhat.com/show_bug.cgi?id=2008910 Signed-off-by: Ondřej Budai --- internal/distro/rhel90/pipelines.go | 2 +- test/data/manifests/rhel_90-aarch64-qcow2-boot.json | 2 +- test/data/manifests/rhel_90-aarch64-qcow2-customize.json | 2 +- test/data/manifests/rhel_90-ppc64le-qcow2-boot.json | 2 +- test/data/manifests/rhel_90-ppc64le-qcow2-customize.json | 2 +- test/data/manifests/rhel_90-s390x-qcow2-boot.json | 2 +- test/data/manifests/rhel_90-s390x-qcow2-customize.json | 2 +- test/data/manifests/rhel_90-x86_64-qcow2-boot.json | 2 +- test/data/manifests/rhel_90-x86_64-qcow2-customize.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go index 997363ddb..7934257a8 100644 --- a/internal/distro/rhel90/pipelines.go +++ b/internal/distro/rhel90/pipelines.go @@ -53,7 +53,7 @@ func qcow2Pipelines(t *imageType, customizations *blueprint.Customizations, opti imagePipeline := liveImagePipeline(treePipeline.Name, diskfile, &partitionTable, t.arch, kernelVer) pipelines = append(pipelines, *imagePipeline) - qemuPipeline := qemuPipeline(imagePipeline.Name, diskfile, t.filename, "qcow2", "0.10") + qemuPipeline := qemuPipeline(imagePipeline.Name, diskfile, t.filename, "qcow2", "1.1") pipelines = append(pipelines, *qemuPipeline) return pipelines, nil diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json index 91477cdbe..78fd10911 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json @@ -1080,7 +1080,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-customize.json b/test/data/manifests/rhel_90-aarch64-qcow2-customize.json index 8ce32053a..049ec814c 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2-customize.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2-customize.json @@ -1415,7 +1415,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json index e7c902785..f6d1ba1bc 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json @@ -1120,7 +1120,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json b/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json index f0a0ae84a..21573357d 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2-customize.json @@ -1461,7 +1461,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json index e554f1b28..98fdc8d7b 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json @@ -1214,7 +1214,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-s390x-qcow2-customize.json b/test/data/manifests/rhel_90-s390x-qcow2-customize.json index fb82b1990..f315ae167 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2-customize.json +++ b/test/data/manifests/rhel_90-s390x-qcow2-customize.json @@ -1539,7 +1539,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json index 80594e241..9be4f6a7b 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json @@ -1132,7 +1132,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } } diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-customize.json b/test/data/manifests/rhel_90-x86_64-qcow2-customize.json index c161c8e03..7e4ff18cd 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2-customize.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2-customize.json @@ -1484,7 +1484,7 @@ "filename": "disk.qcow2", "format": { "type": "qcow2", - "compat": "0.10" + "compat": "1.1" } } }