From 0a3cb1cba064d0b8be64c6f4335cfe3ef55c42e3 Mon Sep 17 00:00:00 2001 From: Mike Beaton Date: Thu, 12 Mar 2026 12:32:33 +0000 Subject: [PATCH] Global: Rename default_linux_image to default_linux_container Now that we have introduced default_linux_vm, the naming becomes somewhat confusing, since there are two different images specified for two different reasons. By naming one of them _vm and the other _container we surface their intended usage in their variable name. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Mike Beaton --- .azurepipelines/Ubuntu-GCC.yml | 2 +- .azurepipelines/templates/defaults.yml | 2 +- ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml | 2 +- EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml | 2 +- OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azurepipelines/Ubuntu-GCC.yml b/.azurepipelines/Ubuntu-GCC.yml index 987dc3f10f..2d53eb58fa 100644 --- a/.azurepipelines/Ubuntu-GCC.yml +++ b/.azurepipelines/Ubuntu-GCC.yml @@ -29,6 +29,6 @@ jobs: parameters: tool_chain_tag: GCC vm_image: ${{ variables.default_linux_vm }} - container: ${{ variables.default_linux_image }} + container: ${{ variables.default_linux_container }} arch_list: "IA32,X64,AARCH64,RISCV64,LOONGARCH64" usePythonVersion: '' # use Python from the container image diff --git a/.azurepipelines/templates/defaults.yml b/.azurepipelines/templates/defaults.yml index 176035de63..c04e3cc008 100644 --- a/.azurepipelines/templates/defaults.yml +++ b/.azurepipelines/templates/defaults.yml @@ -9,6 +9,6 @@ variables: default_python_version: "3.12" - default_linux_image: "ghcr.io/tianocore/containers/fedora-43-test:bde74f8" + default_linux_container: "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 b1e9f9f524..e385c10441 100644 --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml @@ -113,7 +113,7 @@ jobs: pool: vmImage: $(vm_image) - container: ${{ variables.default_linux_image }} + container: ${{ variables.default_linux_container }} steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml index 27c650f1a3..e31fe0e2c1 100644 --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml @@ -87,7 +87,7 @@ jobs: pool: vmImage: $(vm_image) - container: ${{ variables.default_linux_image }} + container: ${{ variables.default_linux_container }} steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml index c6938ebfa9..fde3927ded 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC.yml @@ -155,7 +155,7 @@ jobs: pool: vmImage: $(vm_image) - container: ${{ variables.default_linux_image }} + container: ${{ variables.default_linux_container }} steps: - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml