From 39bef7a76ce1e34e82b770f2ae65f608e67ab112 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Wed, 24 Aug 2022 15:02:06 -0700 Subject: [PATCH] Move to -Svc pool provider --- .azure/pipelines/azure-pipelines-mirror-within-azdo.yml | 2 +- .azure/pipelines/ci.yml | 4 ++-- .azure/pipelines/jobs/default-build.yml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml b/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml index cbf529762baa..76ae879fb7c3 100644 --- a/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml +++ b/.azure/pipelines/azure-pipelines-mirror-within-azdo.yml @@ -26,7 +26,7 @@ jobs: - job: Merge_Azure_DevOps_Branches enableSBOM: false pool: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: - name: WorkingDirectoryName diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 6aa298db30d2..6db014e61013 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -771,7 +771,7 @@ stages: - Helix_x64 - Source_Build_Managed pool: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 publishUsingPipelines: ${{ variables._PublishUsingPipelines }} enablePublishBuildArtifacts: true # publish artifacts/log files @@ -809,7 +809,7 @@ stages: - Helix_x64 - Source_Build_Managed pool: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal # Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 6ff0a2f58fa8..125b09ce792a 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -112,17 +112,17 @@ jobs: vmImage: ubuntu-18.04 ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Public + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals 1es-windows-2022-open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing demands: ImageOverride -equals 1es-windows-2022 ${{ if ne(parameters.container, '') }}: