From e6d31a3d81ad459aecd3501afcf4b0cf28d3cc50 Mon Sep 17 00:00:00 2001
From: Eugene Korenevsky <ekorenevsky@aliyun.com>
Date: Sun, 23 Nov 2025 17:07:33 +0300
Subject: [PATCH] block: qcow: switch qcow2 tests from `focal` to `jammy` qcow2
 images

Signed-off-by: Eugene Korenevsky <ekorenevsky@aliyun.com>
---
 scripts/run_integration_tests_aarch64.sh | 52 +++++++++++-----------
 scripts/run_integration_tests_x86_64.sh  | 56 ++++++++++++------------
 tests/integration.rs                     | 36 +++++++--------
 3 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh
index ff3cdc440..9887013cb 100755
--- a/scripts/run_integration_tests_aarch64.sh
+++ b/scripts/run_integration_tests_aarch64.sh
@@ -46,32 +46,6 @@ update_workloads() {
         popd || exit
     fi
 
-    FOCAL_OS_QCOW2_ZLIB_FILE_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0-zlib.qcow2"
-    FOCAL_OS_QCOW2_ZLIB_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW2_ZLIB_FILE_IMAGE_NAME"
-    if [ ! -f "$FOCAL_OS_QCOW2_ZLIB_FILE_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
-        time qemu-img convert -c -f raw -O qcow2 -o compression_type=zlib \
-            "$FOCAL_OS_RAW_IMAGE" $FOCAL_OS_QCOW2_ZLIB_FILE_IMAGE_NAME
-        popd || exit
-    fi
-
-    FOCAL_OS_QCOW2_ZSTD_FILE_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0-zstd.qcow2"
-    FOCAL_OS_QCOW2_ZSTD_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW2_ZSTD_FILE_IMAGE_NAME"
-    if [ ! -f "$FOCAL_OS_QCOW2_ZSTD_FILE_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
-        time qemu-img convert -c -f raw -O qcow2 -o compression_type=zstd \
-            "$FOCAL_OS_RAW_IMAGE" $FOCAL_OS_QCOW2_ZSTD_FILE_IMAGE_NAME
-        popd || exit
-    fi
-
-    FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME="focal-server-cloudimg-arm64-custom-20210929-0-backing.qcow2"
-    FOCAL_OS_QCOW2_BACKING_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME"
-    if [ ! -f "$FOCAL_OS_QCOW2_BACKING_FILE_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
-        time qemu-img create -f qcow2 -b "$FOCAL_OS_QCOW2_ZSTD_FILE_IMAGE" -F qcow2 $FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME
-        popd || exit
-    fi
-
     JAMMY_OS_RAW_IMAGE_NAME="jammy-server-cloudimg-arm64-custom-20220329-0.raw"
     JAMMY_OS_RAW_IMAGE_DOWNLOAD_URL="https://ch-images.azureedge.net/$JAMMY_OS_RAW_IMAGE_NAME"
     JAMMY_OS_RAW_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_RAW_IMAGE_NAME"
@@ -90,6 +64,32 @@ update_workloads() {
         popd || exit
     fi
 
+    JAMMY_OS_QCOW2_ZLIB_FILE_IMAGE_NAME="jammy-server-cloudimg-arm64-custom-20220329-0-zlib.qcow2"
+    JAMMY_OS_QCOW2_ZLIB_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW2_ZLIB_FILE_IMAGE_NAME"
+    if [ ! -f "$JAMMY_OS_QCOW2_ZLIB_FILE_IMAGE" ]; then
+        pushd "$WORKLOADS_DIR" || exit
+        time qemu-img convert -c -f raw -O qcow2 -o compression_type=zlib \
+            "$JAMMY_OS_RAW_IMAGE" $JAMMY_OS_QCOW2_ZLIB_FILE_IMAGE_NAME
+        popd || exit
+    fi
+
+    JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE_NAME="jammy-server-cloudimg-arm64-custom-20220329-0-zstd.qcow2"
+    JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE_NAME"
+    if [ ! -f "$JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE" ]; then
+        pushd "$WORKLOADS_DIR" || exit
+        time qemu-img convert -c -f raw -O qcow2 -o compression_type=zstd \
+            "$JAMMY_OS_RAW_IMAGE" $JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE_NAME
+        popd || exit
+    fi
+
+    JAMMY_OS_QCOW2_IMAGE_BACKING_FILE_NAME="jammy-server-cloudimg-arm64-custom-20220329-0-backing.qcow2"
+    JAMMY_OS_QCOW2_BACKING_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW2_IMAGE_BACKING_FILE_NAME"
+    if [ ! -f "$JAMMY_OS_QCOW2_BACKING_FILE_IMAGE" ]; then
+        pushd "$WORKLOADS_DIR" || exit
+        time qemu-img create -f qcow2 -b "$JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE" -F qcow2 $JAMMY_OS_QCOW2_IMAGE_BACKING_FILE_NAME
+        popd || exit
+    fi
+
     ALPINE_MINIROOTFS_URL="http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/aarch64/alpine-minirootfs-3.11.3-aarch64.tar.gz"
     ALPINE_MINIROOTFS_TARBALL="$WORKLOADS_DIR/alpine-minirootfs-aarch64.tar.gz"
     if [ ! -f "$ALPINE_MINIROOTFS_TARBALL" ]; then
diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh
index e2848a742..4370c15ac 100755
--- a/scripts/run_integration_tests_x86_64.sh
+++ b/scripts/run_integration_tests_x86_64.sh
@@ -45,34 +45,6 @@ if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
     popd || exit
 fi
 
-FOCAL_OS_QCOW_ZLIB_FILE_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0-zlib.qcow2"
-FOCAL_OS_QCOW_ZLIB_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW_ZLIB_FILE_IMAGE_NAME"
-if [ ! -f "$FOCAL_OS_QCOW_ZLIB_FILE_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
-    time qemu-img convert -c -f raw -O qcow2 -o compression_type=zlib \
-        "$FOCAL_OS_RAW_IMAGE" $FOCAL_OS_QCOW_ZLIB_FILE_IMAGE_NAME
-    popd || exit
-fi
-
-FOCAL_OS_QCOW_ZSTD_FILE_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0-zstd.qcow2"
-FOCAL_OS_QCOW_ZSTD_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW_ZSTD_FILE_IMAGE_NAME"
-if [ ! -f "$FOCAL_OS_QCOW_ZSTD_FILE_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
-    time qemu-img convert -c -f raw -O qcow2 -o compression_type=zstd \
-        "$FOCAL_OS_RAW_IMAGE" $FOCAL_OS_QCOW_ZSTD_FILE_IMAGE_NAME
-    popd || exit
-fi
-
-FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0-backing.qcow2"
-FOCAL_OS_QCOW_BACKING_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME"
-if [ ! -f "$FOCAL_OS_QCOW_BACKING_FILE_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
-    time qemu-img create -f qcow2 \
-        -b "$FOCAL_OS_QCOW_ZSTD_FILE_IMAGE" \
-        -F qcow2 $FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME
-    popd || exit
-fi
-
 JAMMY_OS_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20241017-0.qcow2"
 JAMMY_OS_IMAGE_URL="https://ch-images.azureedge.net/$JAMMY_OS_IMAGE_NAME"
 JAMMY_OS_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_IMAGE_NAME"
@@ -90,6 +62,34 @@ if [ ! -f "$JAMMY_OS_RAW_IMAGE" ]; then
     popd || exit
 fi
 
+JAMMY_OS_QCOW_ZLIB_FILE_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20241017-0-zlib.qcow2"
+JAMMY_OS_QCOW_ZLIB_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW_ZLIB_FILE_IMAGE_NAME"
+if [ ! -f "$JAMMY_OS_QCOW_ZLIB_FILE_IMAGE" ]; then
+    pushd "$WORKLOADS_DIR" || exit
+    time qemu-img convert -c -f raw -O qcow2 -o compression_type=zlib \
+        "$JAMMY_OS_RAW_IMAGE" $JAMMY_OS_QCOW_ZLIB_FILE_IMAGE_NAME
+    popd || exit
+fi
+
+JAMMY_OS_QCOW_ZSTD_FILE_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20241017-0-zstd.qcow2"
+JAMMY_OS_QCOW_ZSTD_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW_ZSTD_FILE_IMAGE_NAME"
+if [ ! -f "$JAMMY_OS_QCOW_ZSTD_FILE_IMAGE" ]; then
+    pushd "$WORKLOADS_DIR" || exit
+    time qemu-img convert -c -f raw -O qcow2 -o compression_type=zstd \
+        "$JAMMY_OS_RAW_IMAGE" $JAMMY_OS_QCOW_ZSTD_FILE_IMAGE_NAME
+    popd || exit
+fi
+
+JAMMY_OS_QCOW_BACKING_FILE_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20241017-0-backing.qcow2"
+JAMMY_OS_QCOW_BACKING_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW_BACKING_FILE_IMAGE_NAME"
+if [ ! -f "$JAMMY_OS_QCOW_BACKING_FILE_IMAGE" ]; then
+    pushd "$WORKLOADS_DIR" || exit
+    time qemu-img create -f qcow2 \
+        -b "$JAMMY_OS_QCOW_ZSTD_FILE_IMAGE" \
+        -F qcow2 $JAMMY_OS_QCOW_BACKING_FILE_IMAGE_NAME
+    popd || exit
+fi
+
 ALPINE_MINIROOTFS_URL="http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz"
 ALPINE_MINIROOTFS_TARBALL="$WORKLOADS_DIR/alpine-minirootfs-x86_64.tar.gz"
 if [ ! -f "$ALPINE_MINIROOTFS_TARBALL" ]; then
diff --git a/tests/integration.rs b/tests/integration.rs
index 276c4e00f..4ef1029b7 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -39,16 +39,16 @@ mod x86_64 {
     pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw";
     pub const JAMMY_VFIO_IMAGE_NAME: &str =
         "jammy-server-cloudimg-amd64-custom-vfio-20241012-0.raw";
-    pub const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-amd64-custom-20210609-0.qcow2";
-    pub const FOCAL_IMAGE_NAME_QCOW2_ZLIB: &str =
-        "focal-server-cloudimg-amd64-custom-20210609-0-zlib.qcow2";
-    pub const FOCAL_IMAGE_NAME_QCOW2_ZSTD: &str =
-        "focal-server-cloudimg-amd64-custom-20210609-0-zstd.qcow2";
-    pub const FOCAL_IMAGE_NAME_QCOW2_BACKING_FILE: &str =
-        "focal-server-cloudimg-amd64-custom-20210609-0-backing.qcow2";
     pub const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhd";
     pub const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhdx";
     pub const JAMMY_IMAGE_NAME: &str = "jammy-server-cloudimg-amd64-custom-20241017-0.raw";
+    pub const JAMMY_IMAGE_NAME_QCOW2: &str = "jammy-server-cloudimg-amd64-custom-20241017-0.qcow2";
+    pub const JAMMY_IMAGE_NAME_QCOW2_ZLIB: &str =
+        "jammy-server-cloudimg-amd64-custom-20241017-0-zlib.qcow2";
+    pub const JAMMY_IMAGE_NAME_QCOW2_ZSTD: &str =
+        "jammy-server-cloudimg-amd64-custom-20241017-0-zstd.qcow2";
+    pub const JAMMY_IMAGE_NAME_QCOW2_BACKING_FILE: &str =
+        "jammy-server-cloudimg-amd64-custom-20241017-0-backing.qcow2";
     pub const WINDOWS_IMAGE_NAME: &str = "windows-server-2022-amd64-2.raw";
     pub const OVMF_NAME: &str = "CLOUDHV.fd";
     pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'IO-APIC.*ttyS0' /proc/interrupts || true";
@@ -62,16 +62,16 @@ mod aarch64 {
     pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0.raw";
     pub const FOCAL_IMAGE_UPDATE_KERNEL_NAME: &str =
         "focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw";
-    pub const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-arm64-custom-20210929-0.qcow2";
-    pub const FOCAL_IMAGE_NAME_QCOW2_ZLIB: &str =
-        "focal-server-cloudimg-arm64-custom-20210929-0-zlib.qcow2";
-    pub const FOCAL_IMAGE_NAME_QCOW2_ZSTD: &str =
-        "focal-server-cloudimg-arm64-custom-20210929-0-zstd.qcow2";
-    pub const FOCAL_IMAGE_NAME_QCOW2_BACKING_FILE: &str =
-        "focal-server-cloudimg-arm64-custom-20210929-0-backing.qcow2";
     pub const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhd";
     pub const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhdx";
     pub const JAMMY_IMAGE_NAME: &str = "jammy-server-cloudimg-arm64-custom-20220329-0.raw";
+    pub const JAMMY_IMAGE_NAME_QCOW2: &str = "jammy-server-cloudimg-arm64-custom-20220329-0.qcow2";
+    pub const JAMMY_IMAGE_NAME_QCOW2_ZLIB: &str =
+        "jammy-server-cloudimg-arm64-custom-20220329-0-zlib.qcow2";
+    pub const JAMMY_IMAGE_NAME_QCOW2_ZSTD: &str =
+        "jammy-server-cloudimg-arm64-custom-20220329-0-zstd.qcow2";
+    pub const JAMMY_IMAGE_NAME_QCOW2_BACKING_FILE: &str =
+        "jammy-server-cloudimg-arm64-custom-20220329-0-backing.qcow2";
     pub const WINDOWS_IMAGE_NAME: &str = "windows-11-iot-enterprise-aarch64.raw";
     pub const OVMF_NAME: &str = "CLOUDHV_EFI.fd";
     pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'GICv3.*uart-pl011' /proc/interrupts || true";
@@ -3493,22 +3493,22 @@ mod common_parallel {
 
     #[test]
     fn test_virtio_block_qcow2() {
-        _test_virtio_block(FOCAL_IMAGE_NAME_QCOW2, false, false);
+        _test_virtio_block(JAMMY_IMAGE_NAME_QCOW2, false, false);
     }
 
     #[test]
     fn test_virtio_block_qcow2_zlib() {
-        _test_virtio_block(FOCAL_IMAGE_NAME_QCOW2_ZLIB, false, false);
+        _test_virtio_block(JAMMY_IMAGE_NAME_QCOW2_ZLIB, false, false);
     }
 
     #[test]
     fn test_virtio_block_qcow2_zstd() {
-        _test_virtio_block(FOCAL_IMAGE_NAME_QCOW2_ZSTD, false, false);
+        _test_virtio_block(JAMMY_IMAGE_NAME_QCOW2_ZSTD, false, false);
     }
 
     #[test]
     fn test_virtio_block_qcow2_backing_file() {
-        _test_virtio_block(FOCAL_IMAGE_NAME_QCOW2_BACKING_FILE, false, false);
+        _test_virtio_block(JAMMY_IMAGE_NAME_QCOW2_BACKING_FILE, false, false);
     }
 
     #[test]