Skip to content

Commit c5ca969

Browse files
authored
Resolve Pip Related Errors (#12157)
* update build-test invocation to set virtualenv prior to invoking setup_execute_tests
1 parent 158f7e1 commit c5ca969

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

eng/ci_tools.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# requirements leveraged by ci tools
22
setuptools==44.1.0; python_version == '2.7'
33
setuptools==45.1.0; python_version >= '3.5'
4+
virtualenv==20.0.24
45
wheel==0.34.2
56
Jinja2==2.11.1
67
packaging==20.4
@@ -32,4 +33,3 @@ pytest-cov==2.8.1
3233
./tools/azure-sdk-tools
3334

3435

35-

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ steps:
2626
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
2727

2828
- script: |
29-
python -m pip install pip == 20.1
30-
pip install -r eng/ci_tools.txt
31-
pip --version
29+
python -m pip install -r eng/ci_tools.txt
30+
mkdir $(Build.SourcesDirectory)/env
31+
python -m virtualenv $(Build.SourcesDirectory)/env
3232
displayName: 'Prep Environment'
3333
3434
- ${{ parameters.BeforeTestSteps }}
3535

36-
- task: PythonScript@0
37-
displayName: 'Run Tests'
38-
inputs:
39-
scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
40-
arguments: >-
41-
"${{ parameters.BuildTargetingString }}"
42-
${{ parameters.AdditionalTestArgs }}
43-
${{ parameters.CoverageArg }}
44-
--mark_arg="${{ parameters.TestMarkArgument }}"
45-
--service="${{ parameters.ServiceDirectory }}"
46-
--toxenv="${{ parameters.ToxTestEnv }}"
47-
--injected-packages="${{ parameters.InjectedPackages }}"
48-
${{ parameters.ToxEnvParallel }}
36+
- pwsh: |
37+
$env:Path = "$(Build.SourcesDirectory)/env;" + $env:Path
38+
python -m pip install pip==20.1
39+
python -m pip install -r eng/ci_tools.txt
40+
python -m pip --version
41+
42+
$env:PYTHON_HOME = ""
43+
$env:VIRTUAL_ENV = "$(Build.SourcesDirectory)/env"
44+
45+
Write-Host 'python ./scripts/devops_tasks/setup_execute_tests.py "${{ parameters.BuildTargetingString }}" ${{ parameters.AdditionalTestArgs }} ${{ parameters.CoverageArg }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}" --toxenv="${{ parameters.ToxTestEnv }}" --injected-packages="${{ parameters.InjectedPackages }}" ${{ parameters.ToxEnvParallel }}"'
46+
python ./scripts/devops_tasks/setup_execute_tests.py "${{ parameters.BuildTargetingString }}" ${{ parameters.AdditionalTestArgs }} ${{ parameters.CoverageArg }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}" --toxenv="${{ parameters.ToxTestEnv }}" --injected-packages="${{ parameters.InjectedPackages }}" ${{ parameters.ToxEnvParallel }}
47+
4948
env: ${{ parameters.EnvVars }}
49+
displayName: 'Run Tests'
5050
5151
- ${{ parameters.AfterTestSteps }}
5252

0 commit comments

Comments
 (0)