From cdce233f61349d029640b2dd2c0403e502050e39 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 10 Sep 2019 09:20:16 -0700 Subject: bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional (GH-15851) (cherry picked from commit 801f925998cc393260f36f5ac77369fef2373ad1) Co-authored-by: Steve Dower --- .azure-pipelines/ci.yml | 4 ++-- .azure-pipelines/macos-steps.yml | 2 ++ .azure-pipelines/pr.yml | 4 ++-- Misc/NEWS.d/next/macOS/2019-09-10-14-24-35.bpo-38089.eedgyD.rst | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/macOS/2019-09-10-14-24-35.bpo-38089.eedgyD.rst diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index fcfac85..12ff7d4 100644 --- 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: diff --git a/.azure-pipelines/macos-steps.yml b/.azure-pipelines/macos-steps.yml index 6470816..d2ca580 100644 --- 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 2486f88..e3e24ae 100644 --- 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: 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 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 -- cgit v0.12