From cc2017f8fc9f23a4740ca0142b092c2a3f17efa2 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Wed, 22 Sep 2021 10:55:04 -0700 Subject: [PATCH 1/2] Switch to 1ES servicing pools on release/6.0 --- azure-pipelines.yml | 4 ++-- eng/pipeline.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 435a6259549..ed87a495ae5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -72,8 +72,8 @@ stages: ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) pool: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019.pre + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre # runAsPublic is used in expressions, which can't read from user-defined variables runAsPublic: false diff --git a/eng/pipeline.yml b/eng/pipeline.yml index c6bc7f43ecd..ac0fa9d302b 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -34,11 +34,11 @@ jobs: # Will eventually change this to two BYOC pools. # agent pool can't be read from a user-defined variable (Azure DevOps limitation) ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019.pre + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.windows.10.amd64.vs2019.pre variables: # needed for signing - name: _TeamName From 60c089160dfac4790702682dd18892594e9b43c7 Mon Sep 17 00:00:00 2001 From: Jon Fortescue Date: Wed, 22 Sep 2021 11:49:27 -0700 Subject: [PATCH 2/2] Lowercase --- eng/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipeline.yml b/eng/pipeline.yml index ac0fa9d302b..8ebe3d7ef47 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -38,7 +38,7 @@ jobs: demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.windows.10.amd64.vs2019.pre + demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre variables: # needed for signing - name: _TeamName