From b8f241fa1ff5bde73baaabdae29e7c0d6c51c810 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Wed, 24 Aug 2022 16:11:02 -0700 Subject: [PATCH 1/2] Move to -Svc pool provider in release branches --- azure-pipelines-integration-corehost.yml | 4 ++-- azure-pipelines-integration-lsp.yml | 2 +- azure-pipelines-official.yml | 6 +++--- azure-pipelines-richnav.yml | 2 +- azure-pipelines.yml | 6 +++--- eng/pipelines/build-unix-job.yml | 2 +- eng/pipelines/build-windows-job.yml | 2 +- eng/pipelines/test-unix-job-single-machine.yml | 2 +- eng/pipelines/test-windows-job-single-machine.yml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/azure-pipelines-integration-corehost.yml b/azure-pipelines-integration-corehost.yml index 54103b057908d..4cb19d7309025 100644 --- a/azure-pipelines-integration-corehost.yml +++ b/azure-pipelines-integration-corehost.yml @@ -36,7 +36,7 @@ pr: jobs: - job: VS_Integration_CoreHost_Debug pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals $(queueName) timeoutInMinutes: 150 variables: @@ -52,7 +52,7 @@ jobs: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - job: VS_Integration_CoreHost_Release pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals $(queueName) timeoutInMinutes: 150 variables: diff --git a/azure-pipelines-integration-lsp.yml b/azure-pipelines-integration-lsp.yml index 62186421e520d..7c22e352f9919 100644 --- a/azure-pipelines-integration-lsp.yml +++ b/azure-pipelines-integration-lsp.yml @@ -25,7 +25,7 @@ variables: jobs: - job: VS_Integration_LSP pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals $(queueName) timeoutInMinutes: 150 diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 69ba83d24eccd..735f3749c4594 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -78,7 +78,7 @@ stages: - stage: build displayName: Build and Test pool: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Svc-Svc-Internal demands: ImageOverride -equals Build.Windows.Amd64.VS2022 jobs: @@ -310,7 +310,7 @@ stages: dependsOn: - OfficialBuild pool: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Svc-Svc-Internal demands: ImageOverride -equals Build.Windows.Amd64.VS2022 - stage: insert @@ -322,7 +322,7 @@ stages: - job: insert displayName: Insert to VS pool: - name: NetCore1ESPool-Svc-Internal + name: NetCore1ESPool-Svc-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - download: current diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml index e113832f281ae..b2796159106d6 100644 --- a/azure-pipelines-richnav.yml +++ b/azure-pipelines-richnav.yml @@ -19,7 +19,7 @@ pr: none jobs: - job: RichCodeNav_Indexing pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open variables: EnableRichCodeNavigation: true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 25342c1531094..d78262122caaa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -182,7 +182,7 @@ jobs: - job: Correctness_Determinism pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open timeoutInMinutes: 90 steps: @@ -198,7 +198,7 @@ jobs: - job: Correctness_Build pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open timeoutInMinutes: 90 steps: @@ -240,7 +240,7 @@ jobs: - job: Correctness_Rebuild pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open timeoutInMinutes: 90 steps: diff --git a/eng/pipelines/build-unix-job.yml b/eng/pipelines/build-unix-job.yml index b0b07fe13551b..f60f07aab725b 100644 --- a/eng/pipelines/build-unix-job.yml +++ b/eng/pipelines/build-unix-job.yml @@ -20,7 +20,7 @@ jobs: - job: ${{ parameters.jobName }} pool: ${{ if ne(parameters.queueName, '') }}: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals ${{ parameters.queueName }} ${{ if ne(parameters.vmImageName, '') }}: diff --git a/eng/pipelines/build-windows-job.yml b/eng/pipelines/build-windows-job.yml index 0948f70550426..d24b50d967c29 100644 --- a/eng/pipelines/build-windows-job.yml +++ b/eng/pipelines/build-windows-job.yml @@ -23,7 +23,7 @@ jobs: - job: ${{ parameters.jobName }} pool: ${{ if ne(parameters.queueName, '') }}: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals ${{ parameters.queueName }} ${{ if ne(parameters.vmImageName, '') }}: diff --git a/eng/pipelines/test-unix-job-single-machine.yml b/eng/pipelines/test-unix-job-single-machine.yml index 367dc26ae28d6..27ff0ff5f47a4 100644 --- a/eng/pipelines/test-unix-job-single-machine.yml +++ b/eng/pipelines/test-unix-job-single-machine.yml @@ -30,7 +30,7 @@ jobs: dependsOn: ${{ parameters.buildJobName }} pool: ${{ if ne(parameters.queueName, '') }}: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals ${{ parameters.queueName }} ${{ if ne(parameters.vmImageName, '') }}: diff --git a/eng/pipelines/test-windows-job-single-machine.yml b/eng/pipelines/test-windows-job-single-machine.yml index 783ff2e5cbe98..cc82a094e5e6a 100644 --- a/eng/pipelines/test-windows-job-single-machine.yml +++ b/eng/pipelines/test-windows-job-single-machine.yml @@ -26,7 +26,7 @@ jobs: - job: ${{ parameters.jobName }} dependsOn: ${{ parameters.buildJobName }} pool: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals ${{ parameters.queueName }} timeoutInMinutes: 120 variables: From e3e88772096936282c1fcb1385bcf6e3bc4d82f9 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Fri, 26 Aug 2022 15:25:00 -0700 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Joey Robichaud --- azure-pipelines-official.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 735f3749c4594..69ba83d24eccd 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -78,7 +78,7 @@ stages: - stage: build displayName: Build and Test pool: - name: NetCore1ESPool-Svc-Svc-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.Amd64.VS2022 jobs: @@ -310,7 +310,7 @@ stages: dependsOn: - OfficialBuild pool: - name: NetCore1ESPool-Svc-Svc-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.Amd64.VS2022 - stage: insert @@ -322,7 +322,7 @@ stages: - job: insert displayName: Insert to VS pool: - name: NetCore1ESPool-Svc-Svc-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - download: current