From 1252123b4a230708abfcd2de8d19d9dee009e968 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Jul 2020 09:41:58 -0700 Subject: [PATCH 1/3] Fixup pools and move to 2019 queues --- .vsts-ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index fc657957817b..8628cafbc8ce 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -40,12 +40,12 @@ stages: parameters: agentOs: Windows_NT pool: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + queue: buildpool.windows.10.amd64.vs2019.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2017 + queue: buildpool.windows.10.amd64.vs2019 timeoutInMinutes: 180 strategy: matrix: @@ -256,8 +256,12 @@ stages: - Darwin publishUsingPipelines: true pool: - name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2019.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCoreInternal-Pool + queue: buildpool.windows.10.amd64.vs2019 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml From 4ac7333e6013ece58c223c75af3b27b40cd8daea Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Jul 2020 09:59:03 -0700 Subject: [PATCH 2/3] Fixup queues --- .vsts-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8628cafbc8ce..8801710e77f0 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -42,10 +42,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2019.open + queue: buildpool.windows.10.amd64.vs2017.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019 + queue: buildpool.windows.10.amd64.vs2017 timeoutInMinutes: 180 strategy: matrix: @@ -258,10 +258,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2019.open + queue: buildpool.windows.10.amd64.vs2017.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019 + queue: buildpool.windows.10.amd64.vs2017 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml From efc8c0c5a3c2b229c243826efab634406c68accd Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Jul 2020 10:40:13 -0700 Subject: [PATCH 3/3] Revert publish build assets to hosted --- .vsts-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8801710e77f0..461be33bbf4e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -256,12 +256,7 @@ stages: - Darwin publishUsingPipelines: true pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2017 + vmImage: vs2017-win2016 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml