Skip to content

Commit 59e5920

Browse files
authored
Use Arcade's pool-providers.yml (#46493)
- import the variable template - use the two variables it provides wherever we name the pool - future release branches will now automatically switch to the -Svc pools
1 parent a4bbcba commit 59e5920

14 files changed

+26
-8
lines changed

.azure/pipelines/azure-pipelines-mirror-within-azdo.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ parameters:
1313
type: boolean
1414

1515
variables:
16-
- group: Mirror-Credentials
16+
- group: Mirror-Credentials
17+
- template: /eng/common/templates/variables/pool-providers.yml
1718

1819
# Merges code from one AzDO branch into another
1920
jobs:
@@ -26,7 +27,7 @@ jobs:
2627
- job: Merge_Azure_DevOps_Branches
2728
enableSBOM: false
2829
pool:
29-
name: NetCore1ESPool-Internal
30+
name: $(DncEngInternalBuildPool)
3031
demands: ImageOverride -equals 1es-windows-2019
3132
variables:
3233
- name: WorkingDirectoryName

.azure/pipelines/benchmarks.yml

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ trigger: none
66
pr:
77
- '*'
88

9+
variables:
10+
- template: /eng/common/templates/variables/pool-providers.yml
11+
912
jobs:
1013
- template: jobs/default-build.yml
1114
parameters:

.azure/pipelines/blazor-daily-tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ variables:
1717
value: 'blazor-e2e-sc-proxy-tunnel'
1818
- name: E2ETESTS_Sauce__HostName
1919
value: 'sauce.local'
20+
- template: /eng/common/templates/variables/pool-providers.yml
2021

2122
jobs:
2223
- template: jobs/default-build.yml

.azure/pipelines/ci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ variables:
152152
value: test
153153
- name: runCodeQL3000
154154
value: ${{ or(eq(variables['Build.Reason'], 'Schedule'), and(eq(variables['Build.Reason'], 'Manual'), eq(parameters.runCodeQL3000, 'true'))) }}
155+
- template: /eng/common/templates/variables/pool-providers.yml
155156

156157
stages:
157158
- stage: build
@@ -832,7 +833,7 @@ stages:
832833
- Helix_x64
833834
- Source_Build_Managed
834835
pool:
835-
name: NetCore1ESPool-Internal
836+
name: $(DncEngInternalBuildPool)
836837
demands: ImageOverride -equals 1es-windows-2019
837838
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
838839
enablePublishBuildArtifacts: true # publish artifacts/log files
@@ -871,7 +872,7 @@ stages:
871872
- Helix_x64
872873
- Source_Build_Managed
873874
pool:
874-
name: NetCore1ESPool-Internal
875+
name: $(DncEngInternalBuildPool)
875876
# Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
876877
demands: ImageOverride -equals 1es-windows-2019
877878
steps:

.azure/pipelines/components-e2e-tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ variables:
2525
value: true
2626
- name: _TeamName
2727
value: AspNetCore
28+
- template: /eng/common/templates/variables/pool-providers.yml
2829

2930
jobs:
3031
- template: jobs/default-build.yml

.azure/pipelines/devBuilds.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ trigger: none
88
# no PR builds
99
pr: none
1010

11+
variables:
12+
- template: /eng/common/templates/variables/pool-providers.yml
13+
1114
stages:
1215
- stage: build_components
1316
displayName: Build Components

.azure/pipelines/helix-matrix.yml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ variables:
2020
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
2121
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2222
- group: DotNet-HelixApi-Access
23+
- template: /eng/common/templates/variables/pool-providers.yml
2324

2425
jobs:
2526
- template: jobs/default-build.yml

.azure/pipelines/jobs/default-build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,17 @@ jobs:
116116
vmImage: ubuntu-20.04
117117
${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
118118
${{ if eq(variables['System.TeamProject'], 'public') }}:
119-
name: NetCore-Public
119+
name: $(DncEngPublicBuildPool)
120120
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
121121
${{ if eq(variables['System.TeamProject'], 'internal') }}:
122-
name: NetCore1ESPool-Internal
122+
name: $(DncEngInternalBuildPool)
123123
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
124124
${{ if eq(parameters.agentOs, 'Windows') }}:
125125
${{ if eq(variables['System.TeamProject'], 'public') }}:
126-
name: NetCore-Public
126+
name: $(DncEngPublicBuildPool)
127127
demands: ImageOverride -equals 1es-windows-2022-open
128128
${{ if eq(variables['System.TeamProject'], 'internal') }}:
129-
name: NetCore1ESPool-Internal
129+
name: $(DncEngInternalBuildPool)
130130
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
131131
demands: ImageOverride -equals 1es-windows-2022
132132
${{ if ne(parameters.container, '') }}:

.azure/pipelines/localization.yml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ parameters:
2525
variables:
2626
- name: _TeamName
2727
value: AspNetCore
28+
- template: /eng/common/templates/variables/pool-providers.yml
2829

2930
jobs:
3031
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:

.azure/pipelines/quarantined-pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ variables:
4545
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
4646
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
4747
- group: DotNet-HelixApi-Access
48+
- template: /eng/common/templates/variables/pool-providers.yml
4849

4950
jobs:
5051
- template: jobs/default-build.yml

.azure/pipelines/quarantined-tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ variables:
1515
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
1616
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
1717
- group: DotNet-HelixApi-Access
18+
- template: /eng/common/templates/variables/pool-providers.yml
1819

1920
jobs:
2021
- template: jobs/default-build.yml

.azure/pipelines/richnav.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ variables:
1717
value: '/p:SkipTestBuild=true'
1818
- name: WindowsNonX64LogArgs
1919
value: -ExcludeCIBinaryLog
20+
- template: /eng/common/templates/variables/pool-providers.yml
2021

2122
stages:
2223
- stage: build

.azure/pipelines/signalr-daily-tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ variables:
88
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
99
- group: DotNet-MSRC-Storage
1010
- group: AzureDevOps-Artifact-Feeds-Pats
11+
- template: /eng/common/templates/variables/pool-providers.yml
1112

1213
# The only Daily Tests we have run in Sauce Labs and only need to run on one machine (because they just trigger SauceLabs)
1314
# Hence we use the 'default-build.yml' template because it represents a single phase

.azure/pipelines/stress.yml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ variables:
1616
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
1717
- name: _BuildArgs
1818
value: ''
19+
- template: /eng/common/templates/variables/pool-providers.yml
20+
1921
jobs:
2022
- template: jobs/default-build.yml
2123
parameters:

0 commit comments

Comments
 (0)