From 99baee8d3741c967b9d801d8f908abaae087a610 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 1 Mar 2021 15:52:24 +0000 Subject: [PATCH] tests: Move Windows integration test to updated OVMF Signed-off-by: Rob Bradford --- Jenkinsfile | 2 +- scripts/run_integration_tests_windows.sh | 2 +- tests/integration.rs | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4a53b1f4..37008649e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -149,7 +149,7 @@ pipeline{ sh "mkdir ${env.HOME}/workloads" azureDownload(storageCredentialId: 'ch-image-store', containerName: 'private-images', - includeFilesPattern: 'OVMF.fd', + includeFilesPattern: 'OVMF-4b47d0c6c8.fd', downloadType: 'container', downloadDirLoc: "${env.HOME}/workloads") azureDownload(storageCredentialId: 'ch-image-store', diff --git a/scripts/run_integration_tests_windows.sh b/scripts/run_integration_tests_windows.sh index f9c8daa38..731163901 100755 --- a/scripts/run_integration_tests_windows.sh +++ b/scripts/run_integration_tests_windows.sh @@ -10,7 +10,7 @@ features_build="" features_test="--features integration_tests" WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw" -OVMF_FW_FILE="/root/workloads/OVMF.fd" +OVMF_FW_FILE="/root/workloads/OVMF-4b47d0c6c8.fd" BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}" CFLAGS="" TARGET_CC="" diff --git a/tests/integration.rs b/tests/integration.rs index b0b7ca382..579ddc7cd 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -102,6 +102,8 @@ mod tests { const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210106-1.vhd"; #[cfg(target_arch = "x86_64")] const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw"; + #[cfg(target_arch = "x86_64")] + const OVMF_NAME: &str = "OVMF-4b47d0c6c8.fd"; const DIRECT_KERNEL_BOOT_CMDLINE: &str = "root=/dev/vda1 console=hvc0 rw systemd.journald.forward_to_console=1"; @@ -6112,7 +6114,7 @@ mod tests { workload_path.push("workloads"); let mut ovmf_path = workload_path.clone(); - ovmf_path.push("OVMF.fd"); + ovmf_path.push(OVMF_NAME); let mut osdisk_path = workload_path; osdisk_path.push(WINDOWS_IMAGE_NAME.to_string()); @@ -6166,7 +6168,7 @@ mod tests { workload_path.push("workloads"); let mut ovmf_path = workload_path.clone(); - ovmf_path.push("OVMF.fd"); + ovmf_path.push(OVMF_NAME); let mut osdisk_path = workload_path; osdisk_path.push(WINDOWS_IMAGE_NAME.to_string());