diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a956bae16..6942c2286 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -25,11 +25,14 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true -- group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs - value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal - /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + value: '' +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /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-official/variables/pool-providers.yml resources: @@ -91,9 +94,14 @@ extends: # Build Retry Configuration - job: Publish_Build_Configuration pool: - name: $(DncEngInternalBuildPool) - image: windows.vs2022preview.amd64 - os: windows + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: windows.vs2022preview.amd64.open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022preview.amd64 + os: windows steps: - task: 1ES.PublishPipelineArtifact@1 displayName: Publish Build Config diff --git a/eng/build.yml b/eng/build.yml index 124863606..dd96b812d 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -81,14 +81,24 @@ jobs: ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true pool: - name: $(DncEngInternalBuildPool) - image: windows.vs2022preview.amd64 - os: windows + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: windows.vs2022.amd64.open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022preview.amd64 + os: windows ${{ if eq(parameters.agentOs, 'Linux') }}: pool: - name: $(DncEngInternalBuildPool) - image: build.ubuntu.2204.amd64 - os: linux + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: build.ubuntu.2204.amd64.open + os: linux + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-ubuntu-2204 + os: linux container: ${{ parameters.container }} ${{ if eq(parameters.agentOs, 'Darwin') }}: pool: