summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Steffen <osteffen@redhat.com>2023-01-16 18:40:30 +0100
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-01-17 19:06:32 +0000
commit7d62df623fb166e186cd8ead2be6b62095517634 (patch)
treedd176a03bace4438128aa0ee5f1570f8108c2a7f
parent89ed7e4795c94ff694454526ea1796e2fc9d5ad6 (diff)
downloadedk2-7d62df623fb166e186cd8ead2be6b62095517634.tar.gz
edk2-7d62df623fb166e186cd8ead2be6b62095517634.tar.bz2
edk2-7d62df623fb166e186cd8ead2be6b62095517634.zip
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>
-rw-r--r--EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml5
-rw-r--r--EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml4
2 files changed, 9 insertions, 0 deletions
diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 416c15e708..a32c57d4aa 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -15,6 +15,10 @@ trigger:
pr:
- master
- stable/*
+
+variables:
+ - template: ../../../.azurepipelines/templates/defaults.yml
+
jobs:
- job: Platform_CI
variables:
@@ -85,3 +89,4 @@ jobs:
build_file: $(Build.File)
build_flags: $(Build.Flags)
run_flags: $(Run.Flags)
+ usePythonVersion: ${{ variables.default_python_version }}
diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index e7ead06ae2..09960e7c7a 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -16,6 +16,9 @@ pr:
- master
- stable/*
+variables:
+ - template: ../../../.azurepipelines/templates/defaults.yml
+
jobs:
- job: Platform_CI
variables:
@@ -128,3 +131,4 @@ jobs:
build_file: $(Build.File)
build_flags: $(Build.Flags)
run_flags: $(Run.Flags)
+ usePythonVersion: ${{ variables.default_python_version }}