diff --git a/Jenkinsfile b/Jenkinsfile index aa9a925e5..02cb7e73f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -201,7 +201,7 @@ pipeline{ stage ('Download assets') { steps { sh "mkdir ${env.HOME}/workloads" - sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-4b47d0c6c8.fd" --name OVMF-4b47d0c6c8.fd --connection-string "$AZURE_CONNECTION_STRING"' + sh 'az storage blob download --container-name private-images --file "$HOME/workloads/OVMF-83041af43c.fd" --name OVMF-83041af43c.fd --connection-string "$AZURE_CONNECTION_STRING"' 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"' } } diff --git a/docs/uefi.md b/docs/uefi.md index f1243cacf..d825e46da 100644 --- a/docs/uefi.md +++ b/docs/uefi.md @@ -17,7 +17,7 @@ cd edk2 . edksetup.sh git submodule update --init -echo "ACTIVE_PLATFORM=OvmfPkg/OvmfCh.dsc" >> Conf/target.txt +echo "ACTIVE_PLATFORM=OvmfPkg/OvmfPkgX64.dsc" >> Conf/target.txt echo "TARGET_ARCH=X64" >> Conf/target.txt echo "TOOL_CHAIN_TAG=GCC5" >> Conf/target.txt @@ -25,7 +25,7 @@ make -C ./BaseTools build ``` -After the successful build, the resulting firmware binaries are available under `Build/OvmfCh/DEBUG_GCC5/FV` underneath the edk2 checkout. +After the successful build, the resulting firmware binaries are available under `Build/OvmfX64/DEBUG_GCC5/FV` underneath the edk2 checkout. ## Using OVMF Binaries @@ -57,7 +57,7 @@ cd edk2 git submodule update --init --recursive cp ../seabios/out/Csm16.bin OvmfPkg/Csm/Csm16/ -echo "ACTIVE_PLATFORM=OvmfPkg/OvmfCh.dsc" >> Conf/target.txt +echo "ACTIVE_PLATFORM=OvmfPkg/OvmfPkgX64.dsc" >> Conf/target.txt echo "TARGET_ARCH=X64" >> Conf/target.txt echo "TOOL_CHAIN_TAG=GCC5" >> Conf/target.txt diff --git a/scripts/run_integration_tests_windows.sh b/scripts/run_integration_tests_windows.sh index cf4335af3..061c8f37d 100755 --- a/scripts/run_integration_tests_windows.sh +++ b/scripts/run_integration_tests_windows.sh @@ -14,7 +14,7 @@ if [ "$hypervisor" = "mshv" ] ; then features_test="--no-default-features --features mshv,common,integration_tests" fi WIN_IMAGE_FILE="/root/workloads/windows-server-2019.raw" -OVMF_FW_FILE="/root/workloads/OVMF-4b47d0c6c8.fd" +OVMF_FW_FILE="/root/workloads/OVMF-83041af43c.fd" BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}" CFLAGS="" TARGET_CC="" diff --git a/tests/integration.rs b/tests/integration.rs index 8e80a0414..00224bf71 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -63,7 +63,7 @@ mod tests { pub const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhdx"; pub const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw"; - pub const OVMF_NAME: &str = "OVMF-4b47d0c6c8.fd"; + pub const OVMF_NAME: &str = "OVMF-83041af43c.fd"; pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'IO-APIC.*ttyS0' /proc/interrupts || true"; }