From 934b20a77ab78ee901664eee9eea8ff77edf8c67 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 10 Feb 2023 16:51:42 +0100 Subject: [PATCH] ci: Switch to Windows Server 2022 The updated image is configured in a same way as the previously used 2019, it has same - Credentials - Services configured, like SAC, SSH, RDP - Size All the Windows updates are applied so the state is current to the date. Also, the latest stable version 0.1.229 of the VirtIO Windows drivers is installed. Signed-off-by: Anatol Belski --- Jenkinsfile | 2 +- scripts/run_integration_tests_windows_x86_64.sh | 2 +- tests/integration.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5b9a54310..4b2988dc3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -217,7 +217,7 @@ pipeline { stage('Download assets') { steps { sh "mkdir ${env.HOME}/workloads" - sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2019.raw" --name windows-server-2019.raw --connection-string "$AZURE_CONNECTION_STRING"' + sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2022-amd64-2.raw" --name windows-server-2022-amd64-2.raw --connection-string "$AZURE_CONNECTION_STRING"' } } stage('Run Windows guest integration tests') { diff --git a/scripts/run_integration_tests_windows_x86_64.sh b/scripts/run_integration_tests_windows_x86_64.sh index 2285a4ff1..aee79a3c3 100755 --- a/scripts/run_integration_tests_windows_x86_64.sh +++ b/scripts/run_integration_tests_windows_x86_64.sh @@ -11,7 +11,7 @@ test_features="" if [ "$hypervisor" = "mshv" ] ; then test_features="--no-default-features --features mshv" fi -WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw" +WIN_IMAGE_FILE="/root/workloads/windows-server-2022-amd64-2.raw" WORKLOADS_DIR="/root/workloads" OVMF_FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/edk2/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]') diff --git a/tests/integration.rs b/tests/integration.rs index 1487aae14..7fcd76868 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -38,7 +38,7 @@ mod x86_64 { 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-20230119-0.raw"; - pub const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw"; + 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"; }