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>

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 7160d95f7e049b337b4f96ebabdf1f675fcae377..6dd90711ac7060c3825162a02b70541949dee1ed 100644 (file)
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -15,6 +15,9 @@ pr:
   - master\r
   - stable/*\r
 \r
+variables:\r
+  - template: ../../../.azurepipelines/templates/defaults.yml\r
+\r
 jobs:\r
   - job: Platform_CI\r
     variables:\r
@@ -187,6 +190,7 @@ jobs:
         build_file: $(Build.File)\r
         build_flags: $(Build.Flags)\r
         run_flags: $(Run.Flags)\r
+        usePythonVersion: ${{ variables.default_python_version }}\r
         extra_install_step:\r
         - bash: sudo apt-get install qemu\r
           displayName: Install qemu\r

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index 7d6344d6383d5273e4b84a08c990b5a0c479c7a7..7e63f419b26b65b7d853c1d6b1481a4a61540102 100644 (file)
--- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -14,6 +14,10 @@ trigger:
 pr:\r
   - master\r
   - stable/*\r
+\r
+variables:\r
+  - template: ../../../.azurepipelines/templates/defaults.yml\r
+\r
 jobs:\r
   - job: Platform_CI\r
     variables:\r
@@ -133,6 +137,7 @@ jobs:
         build_file: $(Build.File)\r
         build_flags: $(Build.Flags)\r
         run_flags: $(Run.Flags)\r
+        usePythonVersion: ${{ variables.default_python_version }}\r
         extra_install_step:\r
         - powershell: choco install qemu --version=2021.5.5; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"\r
           displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI\r