未验证 提交 745e21ff 编写于 作者: P Pradyun Gedam 提交者: GitHub

Merge pull request #8028 from pradyunsg/ci/better-names

Nicer Azure Pipelines setup
......@@ -3,30 +3,28 @@ parameters:
jobs:
- job: Test_Primary
displayName: Test Primary
displayName: Tests /
pool:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
Python27-x86:
"2.7-x86":
python.version: '2.7'
python.architecture: x86
Python27-x64:
"2.7":
python.version: '2.7'
python.architecture: x64
useVenv: true
Python35-x64:
"3.5":
python.version: '3.5'
python.architecture: x64
Python36-x64:
"3.6":
python.version: '3.6'
python.architecture: x64
useVenv: true
Python37-x64:
"3.7":
python.version: '3.7'
python.architecture: x64
Python38-x64:
"3.8":
python.version: '3.8'
python.architecture: x64
maxParallel: 6
......@@ -35,10 +33,9 @@ jobs:
- template: ../steps/run-tests-windows.yml
parameters:
runIntegrationTests: true
useVenv: '$(useVenv)'
- job: Test_Secondary
displayName: Test Secondary
displayName: Tests /
# Don't run integration tests for these runs
# Run after Test_Primary so we don't devour time and jobs if tests are going to fail
dependsOn: Test_Primary
......@@ -48,16 +45,16 @@ jobs:
strategy:
matrix:
# This is for Windows, so test x86 builds
Python35-x86:
"3.5-x86":
python.version: '3.5'
python.architecture: x86
Python36-x86:
"3.6-x86":
python.version: '3.6'
python.architecture: x86
Python37-x86:
"3.7-x86":
python.version: '3.7'
python.architecture: x86
Python38-x86:
"3.8-x86":
python.version: '3.8'
python.architecture: x86
maxParallel: 6
......
......@@ -3,16 +3,16 @@ parameters:
jobs:
- job: Test_Primary
displayName: Test Primary
displayName: Tests /
pool:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
Python27:
"2.7":
python.version: '2.7'
python.architecture: x64
Python36:
"3.6":
python.version: '3.6'
python.architecture: x64
maxParallel: 2
......@@ -21,7 +21,7 @@ jobs:
- template: ../steps/run-tests.yml
- job: Test_Secondary
displayName: Test Secondary
displayName: Tests /
# Run after Test_Primary so we don't devour time and jobs if tests are going to fail
dependsOn: Test_Primary
......@@ -29,13 +29,13 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
Python35:
"3.5":
python.version: '3.5'
python.architecture: x64
Python37:
"3.7":
python.version: '3.7'
python.architecture: x64
Python38:
"3.8":
python.version: '3.8'
python.architecture: x64
maxParallel: 4
......
parameters:
runIntegrationTests:
useVenv: false
steps:
- task: UsePythonVersion@0
......@@ -44,11 +43,8 @@ steps:
# https://bugs.python.org/issue18199
$env:TEMP = "R:\Temp"
tox -e py -- $env:USE_VENV_ARG -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
tox -e py -- -m integration -n auto --duration=5 --junit-xml=junit/integration-test.xml
displayName: Tox run integration tests
env:
${{ if eq(parameters.useVenv, 'true') }}:
USE_VENV_ARG: "--use-venv"
- task: PublishTestResults@2
displayName: Publish Test Results
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册