From 7cd566ea142bbdd01078b58f411f4d3159c2430e Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 24 Feb 2020 10:07:29 -0800 Subject: [PATCH 1/2] Use new Mac OS VM --- build/ci/templates/globals.yml | 2 +- build/ci/vscode-python-ci-manual.yaml | 4 ++-- build/ci/vscode-python-ci.yaml | 2 +- build/ci/vscode-python-nightly-ci.yaml | 8 ++++---- build/ci/vscode-python-nightly-flake-ci.yaml | 6 +++--- build/ci/vscode-python-pr-validation.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/ci/templates/globals.yml b/build/ci/templates/globals.yml index 1303ba0bc8e6..42542c5f78c9 100644 --- a/build/ci/templates/globals.yml +++ b/build/ci/templates/globals.yml @@ -8,4 +8,4 @@ variables: VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log' CI_BRANCH_NAME: ${Build.SourceBranchName} npm_config_cache: $(Pipeline.Workspace)/.npm - + vmImageMacOS: 'macOS-10.15' diff --git a/build/ci/vscode-python-ci-manual.yaml b/build/ci/vscode-python-ci-manual.yaml index dab4e97f07a4..21a67ef23bb9 100644 --- a/build/ci/vscode-python-ci-manual.yaml +++ b/build/ci/vscode-python-ci-manual.yaml @@ -168,7 +168,7 @@ stages: NeedsIPythonReqs: true #maxParallel: 3 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml @@ -205,7 +205,7 @@ stages: NeedsPythonTestReqs: true #maxParallel: 3 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml diff --git a/build/ci/vscode-python-ci.yaml b/build/ci/vscode-python-ci.yaml index fc1cae3c0cb9..7cfd8ee4006a 100644 --- a/build/ci/vscode-python-ci.yaml +++ b/build/ci/vscode-python-ci.yaml @@ -140,7 +140,7 @@ stages: NeedsIPythonReqs: true maxParallel: 2 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml diff --git a/build/ci/vscode-python-nightly-ci.yaml b/build/ci/vscode-python-nightly-ci.yaml index 50395a6fc494..49b94db2e7a3 100644 --- a/build/ci/vscode-python-nightly-ci.yaml +++ b/build/ci/vscode-python-nightly-ci.yaml @@ -224,7 +224,7 @@ stages: NeedsIPythonReqs: true maxParallel: 1 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml @@ -264,7 +264,7 @@ stages: # Note: We only run the smoke tests with the latest Python release. maxParallel: 1 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml @@ -304,7 +304,7 @@ stages: # Note: We only run the smoke tests with the latest Python release. maxParallel: 1 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml @@ -340,7 +340,7 @@ stages: # Note: We only run the smoke tests with the latest Python release. maxParallel: 1 pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml diff --git a/build/ci/vscode-python-nightly-flake-ci.yaml b/build/ci/vscode-python-nightly-flake-ci.yaml index 191e3503a3ea..d9a749d90e59 100644 --- a/build/ci/vscode-python-nightly-flake-ci.yaml +++ b/build/ci/vscode-python-nightly-flake-ci.yaml @@ -81,7 +81,7 @@ stages: NeedsPythonFunctionalReqs: true VSCODE_PYTHON_ROLLING: true pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml @@ -97,7 +97,7 @@ stages: NeedsPythonFunctionalReqs: true VSCODE_PYTHON_ROLLING: true pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml @@ -134,4 +134,4 @@ stages: pool: vmImage: 'vs2017-win2016' steps: - - template: templates/test_phases.yml \ No newline at end of file + - template: templates/test_phases.yml diff --git a/build/ci/vscode-python-pr-validation.yaml b/build/ci/vscode-python-pr-validation.yaml index fd143602a23b..cca59086d64a 100644 --- a/build/ci/vscode-python-pr-validation.yaml +++ b/build/ci/vscode-python-pr-validation.yaml @@ -86,7 +86,7 @@ stages: NeedsPythonTestReqs: true NeedsPythonFunctionalReqs: true pool: - vmImage: 'macos-10.13' + vmImage: '$(vmImageMacOS)' steps: - template: templates/test_phases.yml From f19a4297f5d0fb3df4929c84b0df76c7b8b51216 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 24 Feb 2020 10:44:08 -0800 Subject: [PATCH 2/2] News --- news/3 Code Health/10288.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/3 Code Health/10288.md diff --git a/news/3 Code Health/10288.md b/news/3 Code Health/10288.md new file mode 100644 index 000000000000..ea1ff2246a3d --- /dev/null +++ b/news/3 Code Health/10288.md @@ -0,0 +1 @@ +Use new MacOS VM in Pipelines.