bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional...

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index fcfac85ed9c442d9e5d68e55e2736fd2b540ccdb..9d8da910acda74bd8e13bf872dcda4180519982c 100644 (file)
--- 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

diff --git a/.azure-pipelines/macos-steps.yml b/.azure-pipelines/macos-steps.yml
index 647081689454acc3e64822b28cb04773303c0b55..d2ca580a93d7ddd9c9f3795fbf6db2a97c70dcd2 100644 (file)
--- 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'

diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 2486f88a63fb1584846268c22a98e1148c1db2a1..bafed733a75d93cf52737391498d8a07837c1bed 100644 (file)
--- 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

diff --git 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
new file mode 100644 (file)
index 0000000..4134984
--- /dev/null
+++ 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