From 0110f59fe3b90bb4ee6c02f7084840718a88cf17 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 8 Feb 2023 11:47:59 -0800 Subject: [PATCH] Update to the automated build pool variables (#15438) Co-authored-by: Michael Simons Co-authored-by: Jason Zhai --- .vsts-ci.yml | 8 +++++--- eng/build.yml | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7e5ca7836..b13e6ef8c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -37,6 +37,8 @@ variables: /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) +- template: /eng/common/templates/variables/pool-providers.yml + stages: - stage: Build jobs: @@ -44,10 +46,10 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64 steps: - publish: $(Build.SourcesDirectory)\eng\buildConfiguration @@ -358,5 +360,5 @@ stages: publishAssetsImmediately: true pool: ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 diff --git a/eng/build.yml b/eng/build.yml index 121f81771..ea389797c 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -82,18 +82,18 @@ jobs: enableMicrobuild: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 ${{ if eq(parameters.agentOs, 'Linux') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 container: ${{ parameters.container }} ${{ if eq(parameters.agentOs, 'Darwin') }}: @@ -168,6 +168,8 @@ jobs: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) $(_PgoInstrument) + - template: /eng/common/templates/variables/pool-providers.yml + steps: - checkout: self clean: true