kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: qcow: switch qcow2 tests from focal to jammy qcow2 images

Browse Source 
Signed-off-by: Eugene Korenevsky <ekorenevsky@aliyun.com>
This commit is contained in:
Eugene Korenevsky
2025-11-23 17:07:33 +03:00
committed by Rob Bradford
parent 94ed7c1745
commit e6d31a3d81
3 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/integration.rs
View File

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