[edk2-devel] [PATCH v9 01/12] CI: make Python version configurable

[Michael Kubacki]

I think you should update Ubuntu-GCC5.yml to use templates/defaults.yml 
in this commit since at this point in time containers are not used yet.

Can you also add a copyright header to defaults.yml? Then it will be 
consistent with other yaml files and in place as the file grows in the 
future.

Thanks,
Michael

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Add a new parameter "usePythonVersion" to the CI job templates.
> This makes it possible to specify the version of Python to use.
> The default value is '', in which case Python will not be downloaded
> at runtime and the one provided by the VM/container image will be used.
> 
> Additionally, add a template .azurepipelines/templates/defaults.yml,
> from which the default Pyhton version string can be obtained.
> 
> Signed-off-by: Oliver Steffen <osteffen at redhat.com>
> ---
>   .azurepipelines/Windows-VS2019.yml                     | 4 ++++
>   .azurepipelines/templates/defaults.yml                 | 3 +++
>   .azurepipelines/templates/platform-build-run-steps.yml | 6 +++++-
>   .azurepipelines/templates/pr-gate-build-job.yml        | 2 ++
>   .azurepipelines/templates/pr-gate-steps.yml            | 6 ++++--
>   5 files changed, 18 insertions(+), 3 deletions(-)
>   create mode 100644 .azurepipelines/templates/defaults.yml
> 
> diff --git a/.azurepipelines/Windows-VS2019.yml
> b/.azurepipelines/Windows-VS2019.yml
> index e4bd4b1d2283..89bccde82575 100644
> --- a/.azurepipelines/Windows-VS2019.yml
> +++ b/.azurepipelines/Windows-VS2019.yml
> @@ -12,9 +12,13 @@ pr:
>   - master
>   - stable/*
> 
> +variables:
> +  - template: templates/defaults.yml
> +
>   jobs:
>   - template: templates/pr-gate-build-job.yml
>     parameters:
>       tool_chain_tag: 'VS2019'
>       vm_image: 'windows-2019'
>       arch_list: "IA32,X64"
> +    usePythonVersion: ${{ variables.default_python_version }}
> diff --git a/.azurepipelines/templates/defaults.yml
> b/.azurepipelines/templates/defaults.yml
> new file mode 100644
> index 000000000000..314d03e33af8
> --- /dev/null
> +++ b/.azurepipelines/templates/defaults.yml
> @@ -0,0 +1,3 @@
> +
> +variables:
> +  default_python_version: ">=3.10.6"
> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
> b/.azurepipelines/templates/platform-build-run-steps.yml
> index 40a31a509fc5..8803d80cf51c 100644
> --- a/.azurepipelines/templates/platform-build-run-steps.yml
> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> @@ -34,6 +34,9 @@ parameters:
>   - name: extra_install_step
>     type: stepList
>     default: []
> +- name: usePythonVersion
> +  type: string
> +  default: ''
> 
>   steps:
>   - checkout: self
> @@ -42,8 +45,9 @@ steps:
> 
>   - task: UsePythonVersion at 0
>     inputs:
> -    versionSpec: ">=3.10.6"
> +    versionSpec: ${{ parameters.usePythonVersion }}
>       architecture: "x64"
> +  condition: ne('${{ parameters.usePythonVersion }}', '')
> 
>   - script: pip install -r pip-requirements.txt --upgrade
>     displayName: 'Install/Upgrade pip modules'
> diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
> b/.azurepipelines/templates/pr-gate-build-job.yml
> index 7f88b41dc8d3..f0ef1142da49 100644
> --- a/.azurepipelines/templates/pr-gate-build-job.yml
> +++ b/.azurepipelines/templates/pr-gate-build-job.yml
> @@ -12,6 +12,7 @@ parameters:
>     tool_chain_tag: ''
>     vm_image: ''
>     arch_list: ''
> +  usePythonVersion: ''
> 
>   # Build step
>   jobs:
> @@ -77,3 +78,4 @@ jobs:
>         build_pkgs: $(Build.Pkgs)
>         build_targets: $(Build.Targets)
>         build_archs: ${{ parameters.arch_list }}
> +      usePythonVersion: ${{ parameters.usePythonVersion }}
> diff --git a/.azurepipelines/templates/pr-gate-steps.yml
> b/.azurepipelines/templates/pr-gate-steps.yml
> index cb431e53fcd1..27a44c06011c 100644
> --- a/.azurepipelines/templates/pr-gate-steps.yml
> +++ b/.azurepipelines/templates/pr-gate-steps.yml
> @@ -12,6 +12,7 @@ parameters:
>     build_pkgs: ''
>     build_targets: ''
>     build_archs: ''
> +  usePythonVersion: ''
> 
>   steps:
>   - checkout: self
> @@ -20,8 +21,9 @@ steps:
> 
>   - task: UsePythonVersion at 0
>     inputs:
> -    versionSpec: '>=3.10.6'
> -    architecture: 'x64'
> +    versionSpec: ${{ parameters.usePythonVersion }}
> +    architecture: "x64"
> +  condition: ne('${{ parameters.usePythonVersion }}', '')
> 
>   - script: pip install -r pip-requirements.txt --upgrade
>     displayName: 'Install/Upgrade pip modules'


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96788): https://edk2.groups.io/g/devel/message/96788
Mute This Topic: https://groups.io/mt/95369381/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-