diff options
| author | Steve Dower <steve.dower@python.org> | 2019-09-10 16:53:03 +0100 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2019-09-10 16:53:03 +0100 |
| commit | 801f925998cc393260f36f5ac77369fef2373ad1 (patch) | |
| tree | 82f2ea98d6e508a11e874f19387f889ab0fefa27 /.azure-pipelines | |
| parent | 7d952ded6813c896ea3f4234bb8db5247dcb5484 (diff) | |
| download | cpython3-801f925998cc393260f36f5ac77369fef2373ad1.tar.gz | |
bpo-38089: Move Azure Pipelines to latest VM versions and make macOS tests optional (GH-15851)
Diffstat (limited to '.azure-pipelines')
| -rw-r--r-- | .azure-pipelines/ci.yml | 4 | ||||
| -rw-r--r-- | .azure-pipelines/macos-steps.yml | 2 | ||||
| -rw-r--r-- | .azure-pipelines/pr.yml | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index fcfac85ed9..12ff7d4c55 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 6470816894..d2ca580a93 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 2486f88a63..e3e24ae2a4 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: |