diff --git a/azure-pipelines-integration-lsp.yml b/azure-pipelines-integration-lsp.yml index 48dc9c4c0b5b8..3154e0e74c01a 100644 --- a/azure-pipelines-integration-lsp.yml +++ b/azure-pipelines-integration-lsp.yml @@ -36,8 +36,10 @@ pr: jobs: - job: VS_Integration_LSP + variables: + - template: /eng/common/templates/variables/pool-providers.yml pool: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 135 diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index 8d428d73692b7..258332644df5f 100644 --- a/azure-pipelines-integration.yml +++ b/azure-pipelines-integration.yml @@ -32,8 +32,10 @@ pr: jobs: - job: VS_Integration + variables: + - template: /eng/common/templates/variables/pool-providers.yml pool: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022.amd64.open strategy: maxParallel: 4 diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 31665d7e5a3c4..2e812b1a0b587 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -72,13 +72,14 @@ variables: value: '[Auto Insertion]' - name: Insertion.TitleSuffix value: '' + - template: /eng/common/templates/variables/pool-providers.yml stages: - stage: build displayName: Build and Test pool: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 jobs: @@ -308,7 +309,7 @@ stages: dependsOn: - OfficialBuild pool: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 - stage: insert @@ -320,7 +321,7 @@ stages: - job: insert displayName: Insert to VS pool: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022.amd64 steps: - download: current diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml index bfb97c6f25174..7b8a28e161383 100644 --- a/azure-pipelines-richnav.yml +++ b/azure-pipelines-richnav.yml @@ -18,11 +18,12 @@ pr: none jobs: - job: RichCodeNav_Indexing - pool: - name: NetCore-Svc-Public - demands: ImageOverride -equals windows.vs2022.amd64.open variables: EnableRichCodeNavigation: true + - template: /eng/common/templates/variables/pool-providers.yml + pool: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 200 steps: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d1a522d501568..21fca1bc6e9af 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,6 +14,9 @@ pr: - features/* - demos/* +variables: +- template: /eng/common/templates/variables/pool-providers.yml + # Windows Build and Test Jobs jobs: - template: eng/pipelines/build-windows-job.yml @@ -21,6 +24,7 @@ jobs: jobName: Build_Windows_Debug testArtifactName: Transport_Artifacts_Windows_Debug configuration: Debug + poolName: $(DncEngPublicBuildPool) queueName: windows.vs2022.amd64.open - template: eng/pipelines/build-windows-job.yml @@ -28,6 +32,7 @@ jobs: jobName: Build_Windows_Release testArtifactName: Transport_Artifacts_Windows_Release configuration: Release + poolName: $(DncEngPublicBuildPool) queueName: windows.vs2022.amd64.open - template: eng/pipelines/test-windows-job.yml @@ -65,6 +70,7 @@ jobs: testArtifactName: Transport_Artifacts_Windows_Debug configuration: Debug testArguments: -testCoreClr + poolName: $(DncEngPublicBuildPool) - template: eng/pipelines/test-windows-job.yml parameters: @@ -117,6 +123,7 @@ jobs: jobName: Build_Unix_Debug testArtifactName: Transport_Artifacts_Unix_Debug configuration: Debug + poolName: $(DncEngPublicBuildPool) queueName: Build.Ubuntu.1804.Amd64.Open - template: eng/pipelines/test-unix-job.yml @@ -136,6 +143,7 @@ jobs: testArtifactName: Transport_Artifacts_Unix_Debug configuration: Debug testArguments: --testCoreClr + poolName: $(DncEngPublicBuildPool) queueName: Build.Ubuntu.1804.Amd64.Open - template: eng/pipelines/test-unix-job.yml @@ -153,7 +161,7 @@ jobs: - job: Correctness_Determinism pool: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 90 steps: @@ -169,7 +177,7 @@ jobs: - job: Correctness_Build pool: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 90 steps: @@ -201,7 +209,7 @@ jobs: - job: Correctness_Rebuild pool: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022.amd64.open timeoutInMinutes: 90 steps: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index a7b943c2fa4c1..66f2676b08147 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -29,7 +29,7 @@ variables: # Coalesce the target and source branches so we know when a PR targets a release branch # If these variables are somehow missing, fall back to main (tends to have more capacity) - name: BranchNameForPoolSelection - value: ${{ coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }} + value: ${{ coalesce(variables['system.pullRequest.targetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }} # Any new -Svc alternative pools should have variables added here to allow for splitting work diff --git a/eng/pipelines/build-unix-job.yml b/eng/pipelines/build-unix-job.yml index 4d295295984d6..b198156e9bad0 100644 --- a/eng/pipelines/build-unix-job.yml +++ b/eng/pipelines/build-unix-job.yml @@ -9,6 +9,9 @@ parameters: - name: configuration type: string default: 'Debug' +- name: poolName + type: string + default: 'NetCore-Svc-Public' - name: queueName type: string default: '' @@ -20,7 +23,7 @@ jobs: - job: ${{ parameters.jobName }} pool: ${{ if ne(parameters.queueName, '') }}: - name: NetCore-Svc-Public + name: ${{ parameters.poolName }} 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 eaba27ebaf7b1..f1ca147aa08c3 100644 --- a/eng/pipelines/build-windows-job.yml +++ b/eng/pipelines/build-windows-job.yml @@ -9,6 +9,9 @@ parameters: - name: configuration type: string default: 'Debug' +- name: poolName + type: string + default: 'NetCore-Svc-Public' - name: queueName type: string default: '' @@ -23,7 +26,7 @@ jobs: - job: ${{ parameters.jobName }} pool: ${{ if ne(parameters.queueName, '') }}: - name: NetCore-Svc-Public + name: ${{ parameters.poolName }} 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 5bbdae6a587a9..14a3cb6a8807e 100644 --- a/eng/pipelines/test-unix-job-single-machine.yml +++ b/eng/pipelines/test-unix-job-single-machine.yml @@ -18,6 +18,9 @@ parameters: - name: testArguments type: string default: '' +- name: poolName + type: string + default: 'NetCore-Svc-Public' - name: queueName type: string default: '' @@ -30,7 +33,7 @@ jobs: dependsOn: ${{ parameters.buildJobName }} pool: ${{ if ne(parameters.queueName, '') }}: - name: NetCore-Svc-Public + name: ${{ parameters.poolName }} 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 7fc25575c8bcc..1a19d8a3aae56 100644 --- a/eng/pipelines/test-windows-job-single-machine.yml +++ b/eng/pipelines/test-windows-job-single-machine.yml @@ -18,6 +18,9 @@ parameters: - name: testArguments type: string default: '' +- name: poolName + type: string + default: 'NetCore-Svc-Public' - name: queueName type: string default: 'windows.vs2022.amd64.open' @@ -26,7 +29,7 @@ jobs: - job: ${{ parameters.jobName }} dependsOn: ${{ parameters.buildJobName }} pool: - name: NetCore-Svc-Public + name: ${{ parameters.poolName }} demands: ImageOverride -equals ${{ parameters.queueName }} timeoutInMinutes: 120 variables: