bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional (GH-15851)

6 years ago · 801f925998
4 changed files with 7 additions and 4 deletions
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@ -42,7 +42,7 @@ jobs:
    testRunPlatform: macos

  pool:
-    vmImage: xcode9-macos10.13
+    vmImage: macos-10.14

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

  pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019

  strategy:
    matrix:
--- a/.azure-pipelines/macos-steps.yml
+++ b/.azure-pipelines/macos-steps.yml
@ -14,6 +14,8 @@ steps:

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

 - task: PublishTestResults@2
  displayName: 'Publish Test Results'
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@ -40,7 +40,7 @@ jobs:
    testRunPlatform: macos

  pool:
-    vmImage: xcode9-macos10.13
+    vmImage: macos-10.14

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

  pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019

  strategy:
    matrix:
--- a/Misc/NEWS.d/next/macOS/2019-09-10-14-24-35.bpo-38089.eedgyD.rst
+++ b/Misc/NEWS.d/next/macOS/2019-09-10-14-24-35.bpo-38089.eedgyD.rst
@ -0,0 +1 @@
+Move Azure Pipelines to latest VM versions and make macOS tests optional