bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional (GH-15851)
This commit is contained in:
parent
7d952ded68
commit
801f925998
|
@ -42,7 +42,7 @@ jobs:
|
||||||
testRunPlatform: macos
|
testRunPlatform: macos
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: xcode9-macos10.13
|
vmImage: macos-10.14
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- template: ./macos-steps.yml
|
- template: ./macos-steps.yml
|
||||||
|
@ -131,7 +131,7 @@ jobs:
|
||||||
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
|
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: windows-2019
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
|
@ -14,6 +14,8 @@ steps:
|
||||||
|
|
||||||
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
|
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
|
||||||
displayName: 'Tests'
|
displayName: 'Tests'
|
||||||
|
continueOnError: true
|
||||||
|
timeoutInMinutes: 30
|
||||||
|
|
||||||
- task: PublishTestResults@2
|
- task: PublishTestResults@2
|
||||||
displayName: 'Publish Test Results'
|
displayName: 'Publish Test Results'
|
||||||
|
|
|
@ -40,7 +40,7 @@ jobs:
|
||||||
testRunPlatform: macos
|
testRunPlatform: macos
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: xcode9-macos10.13
|
vmImage: macos-10.14
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- template: ./macos-steps.yml
|
- template: ./macos-steps.yml
|
||||||
|
@ -131,7 +131,7 @@ jobs:
|
||||||
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
|
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: vs2017-win2016
|
vmImage: windows-2019
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Move Azure Pipelines to latest VM versions and make macOS tests optional
|
Loading…
Reference in New Issue