Use the Python supplied by the container image.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .azurepipelines/templates/platform-build-run-steps.yml | 1 +
 .azurepipelines/templates/pr-gate-steps.yml            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
index 40a31a509fc5..3c16fa981d5a 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -44,6 +44,7 @@ steps:
   inputs:
     versionSpec: ">=3.10.6"
     architecture: "x64"
+  condition: not(eq('${{ parameters.tool_chain_tag }}', 'GCC5'))
 
 - script: pip install -r pip-requirements.txt --upgrade
   displayName: 'Install/Upgrade pip modules'
diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
index cb431e53fcd1..df8802718d99 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -22,6 +22,7 @@ steps:
   inputs:
     versionSpec: '>=3.10.6'
     architecture: 'x64'
+  condition: not(eq('${{ parameters.tool_chain_tag }}', 'GCC5'))
 
 - script: pip install -r pip-requirements.txt --upgrade
   displayName: 'Install/Upgrade pip modules'
-- 
2.37.3



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93996): https://edk2.groups.io/g/devel/message/93996
Mute This Topic: https://groups.io/mt/93805165/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

I think we should avoid the expectation that we are in a container if 
and only if we are using GCC5. Instead I would prefer we add a boolean 
parameter to allows us to explicitly use the included python. So instead 
of the GCC check we would have this.

     condition: not(eq('${{ parameters.useIncludedPython }}', 'true'))

Chris Fernald
Microsoft

On 9/20/2022 7:45 AM, Oliver Steffen wrote:
> Use the Python supplied by the container image.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   .azurepipelines/templates/platform-build-run-steps.yml | 1 +
>   .azurepipelines/templates/pr-gate-steps.yml            | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azurepipelines/templates/platform-build-run-steps.yml
> index 40a31a509fc5..3c16fa981d5a 100644
> --- a/.azurepipelines/templates/platform-build-run-steps.yml
> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> @@ -44,6 +44,7 @@ steps:
>     inputs:
>       versionSpec: ">=3.10.6"
>       architecture: "x64"
> +  condition: not(eq('${{ parameters.tool_chain_tag }}', 'GCC5'))
>   
>   - script: pip install -r pip-requirements.txt --upgrade
>     displayName: 'Install/Upgrade pip modules'
> diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml
> index cb431e53fcd1..df8802718d99 100644
> --- a/.azurepipelines/templates/pr-gate-steps.yml
> +++ b/.azurepipelines/templates/pr-gate-steps.yml
> @@ -22,6 +22,7 @@ steps:
>     inputs:
>       versionSpec: '>=3.10.6'
>       architecture: 'x64'
> +  condition: not(eq('${{ parameters.tool_chain_tag }}', 'GCC5'))
>   
>   - 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 (#94062): https://edk2.groups.io/g/devel/message/94062
Mute This Topic: https://groups.io/mt/93805165/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

On Tue, Sep 20, 2022 at 12:41:35PM -0700, Chris Fernald wrote:
> I think we should avoid the expectation that we are in a container if and
> only if we are using GCC5. Instead I would prefer we add a boolean parameter
> to allows us to explicitly use the included python. So instead of the GCC
> check we would have this.

When adding a toplevel container parameter (as suggested in the patch #3
comment) I think we can also simply use that parameter as condition.

take care,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94059): https://edk2.groups.io/g/devel/message/94059
Mute This Topic: https://groups.io/mt/93805165/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-