dsg/cloud-hypervisor
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: qcow: Adjust namings for zstd compresed backing file

Browse source 
Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski 2025-11-28 14:15:00 +01:00 • committed by Rob Bradford
parent f1ffd795e0
commit 248e786363
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/run_integration_tests_aarch64.sh
View file

@ -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

8
scripts/run_integration_tests_x86_64.sh
View file

@ -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

14
tests/integration.rs
View file

@ -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]