Skip to content

Commit 24a630f

Browse files
authored
Use automatic build pool provider in azure-pipelines.yml (#320)
1 parent 6ecb326 commit 24a630f

File tree

1 file changed

+25
-18
lines changed

1 file changed

+25
-18
lines changed

eng/azure-pipelines.yml

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
variables:
22
- template: /eng/common-variables.yml
3+
- template: /eng/common/templates/variables/pool-providers.yml
34
- name: Build.Repository.Clean
45
value: true
56

@@ -37,10 +38,11 @@ stages:
3738
timeoutInMinutes: 360
3839
pool:
3940
${{ if eq(variables['System.TeamProject'], 'public') }}:
40-
vmImage: ubuntu-20.04
41+
name: $(DncEngPublicBuildPool)
42+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
4143
${{ if eq(variables['System.TeamProject'], 'internal') }}:
42-
name: NetCore1ESPool-Internal
43-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
44+
name: $(DncEngInternalBuildPool)
45+
demands: ImageOverride -equals build.ubuntu.2204.amd64
4446
container:
4547
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220531132048-00a561c
4648
steps:
@@ -59,10 +61,11 @@ stages:
5961
timeoutInMinutes: 360
6062
pool:
6163
${{ if eq(variables['System.TeamProject'], 'public') }}:
62-
vmImage: ubuntu-20.04
64+
name: $(DncEngPublicBuildPool)
65+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
6366
${{ if eq(variables['System.TeamProject'], 'internal') }}:
64-
name: NetCore1ESPool-Internal
65-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
67+
name: $(DncEngInternalBuildPool)
68+
demands: ImageOverride -equals build.ubuntu.2204.amd64
6669
container:
6770
# when updating, change emscripten version here: ../.devcontainer/emscripten-version.txt
6871
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20220531132048-00a561c
@@ -83,10 +86,11 @@ stages:
8386
timeoutInMinutes: 360
8487
pool:
8588
${{ if eq(variables['System.TeamProject'], 'public') }}:
86-
vmImage: ubuntu-20.04
89+
name: $(DncEngPublicBuildPool)
90+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
8791
${{ if eq(variables['System.TeamProject'], 'internal') }}:
88-
name: NetCore1ESPool-Internal
89-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
92+
name: $(DncEngInternalBuildPool)
93+
demands: ImageOverride -equals build.ubuntu.2204.amd64
9094
container:
9195
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly
9296
steps:
@@ -105,10 +109,11 @@ stages:
105109
timeoutInMinutes: 360
106110
pool:
107111
${{ if eq(variables['System.TeamProject'], 'public') }}:
108-
vmImage: ubuntu-20.04
112+
name: $(DncEngPublicBuildPool)
113+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
109114
${{ if eq(variables['System.TeamProject'], 'internal') }}:
110-
name: NetCore1ESPool-Internal
111-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
115+
name: $(DncEngInternalBuildPool)
116+
demands: ImageOverride -equals build.ubuntu.2204.amd64
112117
container:
113118
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly
114119
steps:
@@ -184,10 +189,11 @@ stages:
184189
timeoutInMinutes: 360
185190
pool:
186191
${{ if eq(variables['System.TeamProject'], 'public') }}:
187-
vmImage: ubuntu-20.04
192+
name: $(DncEngPublicBuildPool)
193+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
188194
${{ if eq(variables['System.TeamProject'], 'internal') }}:
189-
name: NetCore1ESPool-Internal
190-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
195+
name: $(DncEngInternalBuildPool)
196+
demands: ImageOverride -equals build.ubuntu.2204.amd64
191197
container:
192198
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-android-20220131172314-3983b4e
193199
steps:
@@ -220,10 +226,11 @@ stages:
220226
timeoutInMinutes: 360
221227
pool:
222228
${{ if eq(variables['System.TeamProject'], 'public') }}:
223-
vmImage: windows-2019
229+
name: $(DncEngPublicBuildPool)
230+
demands: ImageOverride -equals windows.vs2022.amd64.open
224231
${{ if eq(variables['System.TeamProject'], 'internal') }}:
225-
name: NetCore1ESPool-Internal
226-
demands: ImageOverride -equals windows.vs2019.amd64
232+
name: $(DncEngInternalBuildPool)
233+
demands: ImageOverride -equals windows.vs2022.amd64
227234
steps:
228235
- task: DownloadPipelineArtifact@2
229236
inputs:

0 commit comments

Comments
 (0)