Skip to content

Commit cdce233

Browse files
miss-islingtonzooba
andcommitted
bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional (GH-15851)
(cherry picked from commit 801f925) Co-authored-by: Steve Dower <[email protected]>
1 parent 6c588a0 commit cdce233

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
testRunPlatform: macos
4343

4444
pool:
45-
vmImage: xcode9-macos10.13
45+
vmImage: macos-10.14
4646

4747
steps:
4848
- template: ./macos-steps.yml
@@ -131,7 +131,7 @@ jobs:
131131
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
132132

133133
pool:
134-
vmImage: vs2017-win2016
134+
vmImage: windows-2019
135135

136136
strategy:
137137
matrix:

.azure-pipelines/macos-steps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ steps:
1414

1515
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
1616
displayName: 'Tests'
17+
continueOnError: true
18+
timeoutInMinutes: 30
1719

1820
- task: PublishTestResults@2
1921
displayName: 'Publish Test Results'

.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
testRunPlatform: macos
4141

4242
pool:
43-
vmImage: xcode9-macos10.13
43+
vmImage: macos-10.14
4444

4545
steps:
4646
- template: ./macos-steps.yml
@@ -131,7 +131,7 @@ jobs:
131131
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
132132

133133
pool:
134-
vmImage: vs2017-win2016
134+
vmImage: windows-2019
135135

136136
strategy:
137137
matrix:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move Azure Pipelines to latest VM versions and make macOS tests optional

0 commit comments

Comments
 (0)