diff --git a/scripts/run_integration_tests_aarch64.sh b/scripts/run_integration_tests_aarch64.sh index a21a282ba..35115461c 100755 --- a/scripts/run_integration_tests_aarch64.sh +++ b/scripts/run_integration_tests_aarch64.sh @@ -82,11 +82,11 @@ update_workloads() { 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 + JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE_NAME="jammy-server-cloudimg-arm64-custom-20220329-0-backing-zstd.qcow2" + JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE_NAME" + if [ ! -f "$JAMMY_OS_QCOW_BACKING_ZSTD_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 + time qemu-img create -f qcow2 -b "$JAMMY_OS_QCOW2_ZSTD_FILE_IMAGE" -F qcow2 $JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE_NAME popd || exit fi diff --git a/scripts/run_integration_tests_x86_64.sh b/scripts/run_integration_tests_x86_64.sh index 68ab92ee2..84cda3b01 100755 --- a/scripts/run_integration_tests_x86_64.sh +++ b/scripts/run_integration_tests_x86_64.sh @@ -80,13 +80,13 @@ if [ ! -f "$JAMMY_OS_QCOW_ZSTD_FILE_IMAGE" ]; then 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 +JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20241017-0-backing-zstd.qcow2" +JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE_NAME" +if [ ! -f "$JAMMY_OS_QCOW_BACKING_ZSTD_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 + -F qcow2 $JAMMY_OS_QCOW_BACKING_ZSTD_FILE_IMAGE_NAME popd || exit fi diff --git a/tests/integration.rs b/tests/integration.rs index 3d2edea21..3757d2a25 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -45,8 +45,8 @@ mod x86_64 { "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 JAMMY_IMAGE_NAME_QCOW2_BACKING_ZSTD_FILE: &str = + "jammy-server-cloudimg-amd64-custom-20241017-0-backing-zstd.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"; @@ -68,8 +68,8 @@ mod aarch64 { "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 JAMMY_IMAGE_NAME_QCOW2_BACKING_ZSTD_FILE: &str = + "jammy-server-cloudimg-arm64-custom-20220329-0-backing-zstd.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"; @@ -3542,9 +3542,9 @@ mod common_parallel { } #[test] - fn test_virtio_block_qcow2_backing_file() { - _test_virtio_block(JAMMY_IMAGE_NAME_QCOW2_BACKING_FILE, false, false); - disk_check_consistency(JAMMY_IMAGE_NAME_QCOW2_BACKING_FILE); + fn test_virtio_block_qcow2_backing_zstd_file() { + _test_virtio_block(JAMMY_IMAGE_NAME_QCOW2_BACKING_ZSTD_FILE, false, false); + disk_check_consistency(JAMMY_IMAGE_NAME_QCOW2_BACKING_ZSTD_FILE); } #[test]