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>
This commit is contained in:
parent
7d62df623f
commit
65cc189414
|
@ -15,6 +15,9 @@ pr:
|
||||||
- master
|
- master
|
||||||
- stable/*
|
- stable/*
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- template: ../../../.azurepipelines/templates/defaults.yml
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: Platform_CI
|
- job: Platform_CI
|
||||||
variables:
|
variables:
|
||||||
|
@ -187,6 +190,7 @@ jobs:
|
||||||
build_file: $(Build.File)
|
build_file: $(Build.File)
|
||||||
build_flags: $(Build.Flags)
|
build_flags: $(Build.Flags)
|
||||||
run_flags: $(Run.Flags)
|
run_flags: $(Run.Flags)
|
||||||
|
usePythonVersion: ${{ variables.default_python_version }}
|
||||||
extra_install_step:
|
extra_install_step:
|
||||||
- bash: sudo apt-get install qemu
|
- bash: sudo apt-get install qemu
|
||||||
displayName: Install qemu
|
displayName: Install qemu
|
||||||
|
|
|
@ -14,6 +14,10 @@ trigger:
|
||||||
pr:
|
pr:
|
||||||
- master
|
- master
|
||||||
- stable/*
|
- stable/*
|
||||||
|
|
||||||
|
variables:
|
||||||
|
- template: ../../../.azurepipelines/templates/defaults.yml
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: Platform_CI
|
- job: Platform_CI
|
||||||
variables:
|
variables:
|
||||||
|
@ -133,6 +137,7 @@ jobs:
|
||||||
build_file: $(Build.File)
|
build_file: $(Build.File)
|
||||||
build_flags: $(Build.Flags)
|
build_flags: $(Build.Flags)
|
||||||
run_flags: $(Run.Flags)
|
run_flags: $(Run.Flags)
|
||||||
|
usePythonVersion: ${{ variables.default_python_version }}
|
||||||
extra_install_step:
|
extra_install_step:
|
||||||
- powershell: choco install qemu --version=2021.5.5; Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
|
- 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
|
displayName: Install QEMU and Set QEMU on path # friendly name displayed in the UI
|
||||||
|
|
Loading…
Reference in New Issue