diff --git a/.azurepipelines/Ubuntu-GCC.yml b/.azurepipelines/Ubuntu-GCC.yml index 2d359ba10d..987dc3f10f 100644 --- a/.azurepipelines/Ubuntu-GCC.yml +++ b/.azurepipelines/Ubuntu-GCC.yml @@ -28,7 +28,7 @@ jobs: - template: templates/pr-gate-build-job.yml parameters: tool_chain_tag: GCC - vm_image: 'ubuntu-24.04' + vm_image: ${{ variables.default_linux_vm }} container: ${{ variables.default_linux_image }} arch_list: "IA32,X64,AARCH64,RISCV64,LOONGARCH64" usePythonVersion: '' # use Python from the container image diff --git a/.azurepipelines/Windows-VS.yml b/.azurepipelines/Windows-VS.yml index 2b5abe2bc7..86d4bff5f9 100644 --- a/.azurepipelines/Windows-VS.yml +++ b/.azurepipelines/Windows-VS.yml @@ -26,7 +26,7 @@ jobs: - template: templates/pr-gate-build-job.yml parameters: tool_chain_tag: 'VS2022' - vm_image: 'windows-2022' + vm_image: ${{ variables.default_windows_vm }} arch_list: "IA32,X64" usePythonVersion: ${{ variables.default_python_version }} extra_install_step: diff --git a/.azurepipelines/templates/defaults.yml b/.azurepipelines/templates/defaults.yml index 33d2e09a39..176035de63 100644 --- a/.azurepipelines/templates/defaults.yml +++ b/.azurepipelines/templates/defaults.yml @@ -10,3 +10,5 @@ variables: default_python_version: "3.12" default_linux_image: "ghcr.io/tianocore/containers/fedora-43-test:bde74f8" + default_linux_vm: "ubuntu-24.04" + default_windows_vm: "windows-2022" diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml index 06405f44d6..b1e9f9f524 100644 --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml @@ -30,7 +30,7 @@ jobs: - job: Platform_CI variables: package: 'ArmVirtPkg' - vm_image: 'ubuntu-24.04' + vm_image: ${{ variables.default_linux_vm }} should_run: true run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE" diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml index 9e7bea3f6c..27c650f1a3 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml @@ -31,7 +31,7 @@ jobs: - job: Platform_CI variables: package: 'EmulatorPkg' - vm_image: 'ubuntu-24.04' + vm_image: ${{ variables.default_linux_vm }} should_run: false run_flags: "MAKE_STARTUP_NSH=TRUE" diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml index 5c452d5174..8c21327fc2 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS.yml @@ -31,7 +31,7 @@ jobs: - job: Platform_CI variables: package: 'EmulatorPkg' - vm_image: 'windows-2022' + vm_image: ${{ variables.default_windows_vm }} should_run: true run_flags: "MAKE_STARTUP_NSH=TRUE" diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml index 9b7a1a9218..c6938ebfa9 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml @@ -30,7 +30,7 @@ jobs: - job: Platform_CI variables: package: 'OvmfPkg' - vm_image: 'ubuntu-24.04' + vm_image: ${{ variables.default_linux_vm }} should_run: true run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE" diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS.yml index 5d3ea1db41..ae53dd814d 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS.yml @@ -30,7 +30,7 @@ jobs: - job: Platform_CI variables: package: 'OvmfPkg' - vm_image: 'windows-2022' + vm_image: ${{ variables.default_windows_vm }} should_run: true run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"