EmulatorPkg: 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: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Chris Fernald <chfernal@microsoft.com>

diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 416c15e7084084a65e6da9c28daddd6c65b654ec..a32c57d4aab440a965f57739cfcf3fd37c172f41 100644 (file)
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -15,6 +15,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
@@ -85,3 +89,4 @@ jobs:
         build_file: $(Build.File)\r
         build_flags: $(Build.Flags)\r
         run_flags: $(Run.Flags)\r
+        usePythonVersion: ${{ variables.default_python_version }}\r

diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index e7ead06ae26699f7f03fc8b5e391258ca9a9afbc..09960e7c7a6e7f5b56bd24e175f0d6143a279a51 100644 (file)
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -16,6 +16,9 @@ pr:
   - master\r
   - stable/*\r
 \r
+variables:\r
+  - template: ../../../.azurepipelines/templates/defaults.yml\r
+\r
 jobs:\r
   - job: Platform_CI\r
     variables:\r
@@ -128,3 +131,4 @@ jobs:
         build_file: $(Build.File)\r
         build_flags: $(Build.Flags)\r
         run_flags: $(Run.Flags)\r
+        usePythonVersion: ${{ variables.default_python_version }}\r