Skip to content

Commit 2d36cc9

Browse files
scbeddVinothini Dharmaraj
authored andcommitted
Re-enable venv for testing (#36465)
* use a venv for test steps
1 parent 5786cad commit 2d36cc9

File tree

1 file changed

+68
-22
lines changed

1 file changed

+68
-22
lines changed

eng/pipelines/templates/steps/build-test.yml

Lines changed: 68 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,25 @@ steps:
3131
parameters:
3232
versionSpec: '${{ parameters.PythonVersion }}'
3333

34+
- template: /eng/pipelines/templates/steps/use-venv.yml
35+
3436
- template: set-dev-build.yml
3537
parameters:
3638
ServiceDirectory: ${{ parameters.ServiceDirectory }}
3739

3840
- pwsh: |
41+
if ($IsWindows) {
42+
. $(VENV_LOCATION)/Scripts/Activate.ps1
43+
}
44+
else {
45+
. $(VENV_LOCATION)/bin/activate.ps1
46+
}
3947
$ErrorActionPreference = 'Stop'
4048
$PSNativeCommandUseErrorActionPreference = $true
41-
python -m pip freeze
42-
python -m pip install pip==23.2.1
43-
python -m pip install wheel==0.43.0 --force-reinstall
44-
python -m pip install setuptools==69.2.0 --force-reinstall
45-
python -m pip install -r eng/ci_tools.txt
46-
pip --version
47-
pip freeze
48-
displayName: 'Prep Environment Linux/Mac'
49+
python -m pip install --force -r eng/ci_tools.txt
50+
python -m pip freeze --all
51+
Write-Host (Get-Command python).Source
52+
displayName: 'Prep Environment'
4953
5054
- ${{if eq(parameters.TestProxy, true) }}:
5155
- template: /eng/common/testproxy/test-proxy-tool.yml
@@ -61,20 +65,62 @@ steps:
6165

6266
- template: /eng/pipelines/templates/steps/seed-virtualenv-wheels.yml
6367

64-
- task: PythonScript@0
65-
displayName: 'Run Tests'
66-
inputs:
67-
scriptPath: 'scripts/devops_tasks/dispatch_tox.py'
68-
arguments: >-
69-
"$(TargetingString)"
70-
${{ parameters.AdditionalTestArgs }}
71-
${{ parameters.CoverageArg }}
72-
--mark_arg="${{ parameters.TestMarkArgument }}"
73-
--service="${{ parameters.ServiceDirectory }}"
74-
--toxenv="${{ parameters.ToxTestEnv }}"
75-
--injected-packages="${{ parameters.InjectedPackages }}"
76-
${{ parameters.ToxEnvParallel }}
77-
env: ${{ parameters.EnvVars }}
68+
- ${{ if eq('true', parameters.UseFederatedAuth) }}:
69+
70+
- task: AzurePowerShell@5
71+
displayName: Run Tests (AzurePowerShell@5)
72+
env:
73+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
74+
${{ insert }}: ${{ parameters.EnvVars }}
75+
inputs:
76+
azureSubscription: ${{ parameters.ServiceConnection }}
77+
azurePowerShellVersion: LatestVersion
78+
pwsh: true
79+
ScriptType: InlineScript
80+
Inline: >-
81+
if ($IsWindows) {
82+
. $(VENV_LOCATION)/Scripts/Activate.ps1
83+
}
84+
else {
85+
. $(VENV_LOCATION)/bin/activate.ps1
86+
}
87+
Write-Host (Get-Command python).Source
88+
$account = (Get-AzContext).Account;
89+
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id;
90+
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants;
91+
92+
python scripts/devops_tasks/dispatch_tox.py
93+
"$(TargetingString)"
94+
${{ parameters.AdditionalTestArgs }}
95+
${{ parameters.CoverageArg }}
96+
--mark_arg="${{ parameters.TestMarkArgument }}"
97+
--service="${{ parameters.ServiceDirectory }}"
98+
--toxenv="${{ parameters.ToxTestEnv }}"
99+
--injected-packages="${{ parameters.InjectedPackages }}"
100+
${{ parameters.ToxEnvParallel }};
101+
Write-Host "Last exit code: $LASTEXITCODE";
102+
exit $LASTEXITCODE;
103+
104+
- ${{ else }}:
105+
- pwsh: |
106+
if ($IsWindows) {
107+
. $(VENV_LOCATION)/Scripts/Activate.ps1
108+
}
109+
else {
110+
. $(VENV_LOCATION)/bin/activate.ps1
111+
}
112+
Write-Host (Get-Command python).Source
113+
python scripts/devops_tasks/dispatch_tox.py "$(TargetingString)" `
114+
${{ parameters.AdditionalTestArgs }} `
115+
${{ parameters.CoverageArg }} `
116+
--mark_arg="${{ parameters.TestMarkArgument }}" `
117+
--service="${{ parameters.ServiceDirectory }}" `
118+
--toxenv="${{ parameters.ToxTestEnv }}" `
119+
--injected-packages="${{ parameters.InjectedPackages }}" `
120+
${{ parameters.ToxEnvParallel }}
121+
exit $LASTEXITCODE;
122+
env: ${{ parameters.EnvVars }}
123+
displayName: Run Tests
78124
79125
- ${{if eq(parameters.TestProxy, true) }}:
80126
- pwsh: |

0 commit comments

Comments
 (0)