Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/ci_tools.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# requirements leveraged by ci tools
setuptools==44.1.0; python_version == '2.7'
setuptools==45.1.0; python_version >= '3.5'
virtualenv==20.0.24
wheel==0.34.2
Jinja2==2.11.1
packaging==20.4
Expand Down Expand Up @@ -32,4 +33,3 @@ pytest-cov==2.8.1
./tools/azure-sdk-tools



32 changes: 16 additions & 16 deletions eng/pipelines/templates/steps/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ steps:
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml

- script: |
python -m pip install pip == 20.1
pip install -r eng/ci_tools.txt
pip --version
python -m pip install -r eng/ci_tools.txt
Copy link
Member Author

@scbedd scbedd Jun 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to re-add the pip pin here. But the default currently is 20.1. I will do it in a follow-up PR.

mkdir $(Build.SourcesDirectory)/env
python -m virtualenv $(Build.SourcesDirectory)/env
displayName: 'Prep Environment'

- ${{ parameters.BeforeTestSteps }}

- task: PythonScript@0
displayName: 'Run Tests'
inputs:
scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
arguments: >-
"${{ parameters.BuildTargetingString }}"
${{ parameters.AdditionalTestArgs }}
${{ parameters.CoverageArg }}
--mark_arg="${{ parameters.TestMarkArgument }}"
--service="${{ parameters.ServiceDirectory }}"
--toxenv="${{ parameters.ToxTestEnv }}"
--injected-packages="${{ parameters.InjectedPackages }}"
${{ parameters.ToxEnvParallel }}
- pwsh: |
$env:Path = "$(Build.SourcesDirectory)/env;" + $env:Path
python -m pip install pip==20.1
python -m pip install -r eng/ci_tools.txt
python -m pip --version

$env:PYTHON_HOME = ""
$env:VIRTUAL_ENV = "$(Build.SourcesDirectory)/env"

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 }}"'
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 }}

env: ${{ parameters.EnvVars }}
displayName: 'Run Tests'

- ${{ parameters.AfterTestSteps }}

Expand Down