Repository: osbuild/osbuild-composer
Pull request #1866 (2021-10-01 13:07:28)

Backport qcow2 fix and release 33.3
Backporting:
- https://github.com/osbuild/osbuild-composer/pull/1848 for the actual bugfix
- https://github.com/osbuild/osbuild-composer/pull/1861 for one CI fix


Patch:
diff --git a/NEWS.md b/NEWS.md
index b23f379bd..c7c750928 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,11 @@
+## CHANGES WITH 33.3:
+
+  * qcow2 images for RHEL 9.0 are now shipped in v3 format instead of v2. 
+
+Contributions from: Ondřej Budai
+
+— Liberec, 2021-09-28
+
 ## CHANGES WITH 33.2:
 
   * Edge images for 8.5 now ship with bootloader set to none which fixes
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index 86b2d1a46..345fbf768 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/osbuild-composer.spec b/osbuild-composer.spec
index ebf54ecf3..80d40f545 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -4,7 +4,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        33.2
+Version:        33.3
 
 %gometa
 
diff --git a/tools/provision.sh b/tools/provision.sh
index 25badacc8..b0257817d 100755
--- a/tools/provision.sh
+++ b/tools/provision.sh
@@ -21,7 +21,7 @@ elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then
     sudo dnf copr enable -y copr.devel.redhat.com/osbuild-team/epel-el9 "rhel-9.dev-$ARCH"
     # koji is not available yet apparently
     # jmespath required for json_query
-    sudo dnf install -y ansible python3-jmespath
+    sudo dnf install -y ansible-core python3-jmespath
 
     # json_query filter, used in our ansible playbooks, was moved to the
     # 'community.general' collection


Test patch:
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"
               }
             }
           }