diff options
| author | Oliver Steffen <osteffen@redhat.com> | 2023-01-16 18:40:31 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-01-17 19:06:32 +0000 |
| commit | 65cc189414012e0ecd9be1abb2b152e9bafa7c1f (patch) | |
| tree | 60e3112aac20bb98e8efe454cd14dea6046835d4 | |
| parent | 7d62df623fb166e186cd8ead2be6b62095517634 (diff) | |
| download | edk2-65cc189414012e0ecd9be1abb2b152e9bafa7c1f.tar.gz edk2-65cc189414012e0ecd9be1abb2b152e9bafa7c1f.tar.bz2 edk2-65cc189414012e0ecd9be1abb2b152e9bafa7c1f.zip | |
OvmfPkg: CI: use Python version from defaults template
Use the default Python version from the defaults template
(.azurepipelines/templates/defaults.yml) in the Windows and
Linux CI jobs.
Previous changes to the CI job templates make it necessary
to specify a version number, if Python shall be pulled
at CI runtime.
Signed-off-by: Oliver Steffen <osteffen@redhat.com>
Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
Acked-by: Jiewen Yao <jiewen.yao@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Chris Fernald <chfernal@microsoft.com>
| -rw-r--r-- | OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 4 | ||||
| -rw-r--r-- | OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml index 7160d95f7e..6dd90711ac 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml @@ -15,6 +15,9 @@ pr: - master
- stable/*
+variables:
+ - template: ../../../.azurepipelines/templates/defaults.yml
+
jobs:
- job: Platform_CI
variables:
@@ -187,6 +190,7 @@ jobs: build_file: $(Build.File)
build_flags: $(Build.Flags)
run_flags: $(Run.Flags)
+ usePythonVersion: ${{ variables.default_python_version }}
extra_install_step:
- bash: sudo apt-get install qemu
displayName: Install qemu
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml index 7d6344d638..7e63f419b2 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml @@ -14,6 +14,10 @@ trigger: pr:
- master
- stable/*
+
+variables:
+ - template: ../../../.azurepipelines/templates/defaults.yml
+
jobs:
- job: Platform_CI
variables:
@@ -133,6 +137,7 @@ jobs: build_file: $(Build.File)
build_flags: $(Build.Flags)
run_flags: $(Run.Flags)
+ usePythonVersion: ${{ variables.default_python_version }}
extra_install_step:
- powershell: choco install qemu --version=2021.5.5; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
|