Skip to content

Commit 30900da

Browse files
amanasifkhalidamanasifkhalid
authored
[release/6.0-staging] Merge #75473 (#103266)
This introduces new templates from #75473 needed to switch over the .NET 6 servicing branch to 1ES templates. Once this is merged, #102681 (along with some pool provider updates) should be all we need to switch release/6.0-staging over to 1ES templates.
1 parent 318da1f commit 30900da

File tree

68 files changed

+5261
-5092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+5261
-5092
lines changed

‎eng/pipelines/common/build-coreclr-and-libraries-job.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ parameters:
77
container: ''
88
testGroup: ''
99
crossBuild: false
10-
crossrootfsDir: ''
1110
timeoutInMinutes: ''
1211
signBinaries: false
1312
stagedBuild: false
@@ -27,7 +26,6 @@ jobs:
2726
container: ${{ parameters.container }}
2827
testGroup: ${{ parameters.testGroup }}
2928
crossBuild: ${{ parameters.crossBuild }}
30-
crossrootfsDir: ${{ parameters.crossrootfsDir }}
3129
timeoutInminutes: ${{ parameters.timeoutInMinutes }}
3230
signBinaries: ${{ parameters.signBinaries }}
3331
stagedBuild: ${{ parameters.stagedBuild }}
@@ -46,7 +44,6 @@ jobs:
4644
container: ${{ parameters.container }}
4745
testGroup: ${{ parameters.testGroup }}
4846
crossBuild: ${{ parameters.crossBuild }}
49-
crossrootfsDir: ${{ parameters.crossrootfsDir }}
5047
timeoutInminutes: ${{ parameters.timeoutInMinutes }}
5148
variables: ${{ parameters.variables }}
5249
pool: ${{ parameters.pool }}

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ parameters:
77
osSubgroup: ''
88
container: ''
99
crossBuild: false
10-
crossrootfsDir: ''
1110
variables: []
1211
targetRid: ''
1312
timeoutInMinutes: ''

‎eng/pipelines/common/platform-matrix.yml‎

Lines changed: 14 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ jobs:
3737
archType: arm
3838
targetRid: linux-arm
3939
platform: Linux_arm
40-
container:
41-
image: ubuntu-16.04-cross-20210719121212-8a8d3be
42-
registry: mcr
40+
container: Linux_arm
4341
jobParameters:
4442
runtimeFlavor: ${{ parameters.runtimeFlavor }}
4543
stagedBuild: ${{ parameters.stagedBuild }}
@@ -48,7 +46,6 @@ jobs:
4846
platforms: ${{ parameters.platforms }}
4947
helixQueueGroup: ${{ parameters.helixQueueGroup }}
5048
crossBuild: true
51-
crossrootfsDir: '/crossrootfs/arm'
5249
${{ insert }}: ${{ parameters.jobParameters }}
5350

5451
# Linux arm64
@@ -63,9 +60,7 @@ jobs:
6360
archType: arm64
6461
targetRid: linux-arm64
6562
platform: Linux_arm64
66-
container:
67-
image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
68-
registry: mcr
63+
container: Linux_arm64
6964
jobParameters:
7065
runtimeFlavor: ${{ parameters.runtimeFlavor }}
7166
stagedBuild: ${{ parameters.stagedBuild }}
@@ -74,7 +69,6 @@ jobs:
7469
platforms: ${{ parameters.platforms }}
7570
helixQueueGroup: ${{ parameters.helixQueueGroup }}
7671
crossBuild: true
77-
crossrootfsDir: '/crossrootfs/arm64'
7872
${{ insert }}: ${{ parameters.jobParameters }}
7973

8074
# Linux musl x64
@@ -90,9 +84,7 @@ jobs:
9084
archType: x64
9185
targetRid: linux-musl-x64
9286
platform: Linux_musl_x64
93-
container:
94-
image: alpine-3.13-WithNode-20210910135845-c401c85
95-
registry: mcr
87+
container: Linux_musl_x64
9688
jobParameters:
9789
runtimeFlavor: ${{ parameters.runtimeFlavor }}
9890
stagedBuild: ${{ parameters.stagedBuild }}
@@ -115,9 +107,7 @@ jobs:
115107
archType: arm
116108
targetRid: linux-musl-arm
117109
platform: Linux_musl_arm
118-
container:
119-
image: ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9
120-
registry: mcr
110+
container: Linux_musl_arm
121111
jobParameters:
122112
runtimeFlavor: ${{ parameters.runtimeFlavor }}
123113
stagedBuild: ${{ parameters.stagedBuild }}
@@ -126,7 +116,6 @@ jobs:
126116
platforms: ${{ parameters.platforms }}
127117
helixQueueGroup: ${{ parameters.helixQueueGroup }}
128118
crossBuild: true
129-
crossrootfsDir: '/crossrootfs/arm'
130119
${{ insert }}: ${{ parameters.jobParameters }}
131120

132121
# Linux musl arm64
@@ -142,9 +131,7 @@ jobs:
142131
archType: arm64
143132
targetRid: linux-musl-arm64
144133
platform: Linux_musl_arm64
145-
container:
146-
image: ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
147-
registry: mcr
134+
container: Linux_musl_arm64
148135
jobParameters:
149136
runtimeFlavor: ${{ parameters.runtimeFlavor }}
150137
stagedBuild: ${{ parameters.stagedBuild }}
@@ -153,7 +140,6 @@ jobs:
153140
platforms: ${{ parameters.platforms }}
154141
helixQueueGroup: ${{ parameters.helixQueueGroup }}
155142
crossBuild: true
156-
crossrootfsDir: '/crossrootfs/arm64'
157143
${{ insert }}: ${{ parameters.jobParameters }}
158144

159145
# Linux x64
@@ -168,9 +154,7 @@ jobs:
168154
archType: x64
169155
targetRid: linux-x64
170156
platform: Linux_x64
171-
container:
172-
image: centos-7-20210714125435-9b5bbc2
173-
registry: mcr
157+
container: Linux_x64
174158
jobParameters:
175159
runtimeFlavor: ${{ parameters.runtimeFlavor }}
176160
stagedBuild: ${{ parameters.stagedBuild }}
@@ -192,9 +176,7 @@ jobs:
192176
archType: x64
193177
targetRid: linux-x64
194178
platform: Linux_x64
195-
container:
196-
image: centos-7-source-build-20210714125450-5d87b80
197-
registry: mcr
179+
container: SourceBuild_Linux_x64
198180
jobParameters:
199181
runtimeFlavor: ${{ parameters.runtimeFlavor }}
200182
stagedBuild: ${{ parameters.stagedBuild }}
@@ -217,9 +199,7 @@ jobs:
217199
archType: s390x
218200
targetRid: linux-s390x
219201
platform: Linux_s390x
220-
container:
221-
image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
222-
registry: mcr
202+
container: Linux_s390x
223203
jobParameters:
224204
runtimeFlavor: ${{ parameters.runtimeFlavor }}
225205
stagedBuild: ${{ parameters.stagedBuild }}
@@ -228,7 +208,6 @@ jobs:
228208
platforms: ${{ parameters.platforms }}
229209
helixQueueGroup: ${{ parameters.helixQueueGroup }}
230210
crossBuild: true
231-
crossrootfsDir: '/crossrootfs/s390x'
232211
${{ insert }}: ${{ parameters.jobParameters }}
233212

234213
# WebAssembly
@@ -244,9 +223,7 @@ jobs:
244223
archType: wasm
245224
targetRid: browser-wasm
246225
platform: Browser_wasm
247-
container:
248-
image: ubuntu-18.04-webassembly-20210531091624-f5c7a43
249-
registry: mcr
226+
container: Browser_wasm
250227
jobParameters:
251228
runtimeFlavor: ${{ parameters.runtimeFlavor }}
252229
stagedBuild: ${{ parameters.stagedBuild }}
@@ -287,15 +264,12 @@ jobs:
287264
archType: x64
288265
targetRid: freebsd-x64
289266
platform: FreeBSD_x64
290-
container:
291-
image: ubuntu-18.04-cross-freebsd-11-20200407092345-a84b0d2
292-
registry: mcr
267+
container: FreeBSD_x64
293268
jobParameters:
294269
runtimeFlavor: ${{ parameters.runtimeFlavor }}
295270
buildConfig: ${{ parameters.buildConfig }}
296271
helixQueueGroup: ${{ parameters.helixQueueGroup }}
297272
crossBuild: true
298-
crossrootfsDir: '/crossrootfs/x64'
299273
${{ if eq(parameters.passPlatforms, true) }}:
300274
platforms: ${{ parameters.platforms }}
301275
${{ insert }}: ${{ parameters.jobParameters }}
@@ -312,9 +286,7 @@ jobs:
312286
archType: x64
313287
targetRid: android-x64
314288
platform: Android_x64
315-
container:
316-
image: ubuntu-18.04-android-20200422191843-e2c3f83
317-
registry: mcr
289+
container: Linux_bionic
318290
jobParameters:
319291
runtimeFlavor: mono
320292
stagedBuild: ${{ parameters.stagedBuild }}
@@ -336,9 +308,7 @@ jobs:
336308
archType: x86
337309
targetRid: android-x86
338310
platform: Android_x86
339-
container:
340-
image: ubuntu-18.04-android-20200422191843-e2c3f83
341-
registry: mcr
311+
container: Linux_bionic
342312
jobParameters:
343313
runtimeFlavor: mono
344314
stagedBuild: ${{ parameters.stagedBuild }}
@@ -360,9 +330,7 @@ jobs:
360330
archType: arm
361331
targetRid: android-arm
362332
platform: Android_arm
363-
container:
364-
image: ubuntu-18.04-android-20200422191843-e2c3f83
365-
registry: mcr
333+
container: Linux_bionic
366334
jobParameters:
367335
runtimeFlavor: mono
368336
stagedBuild: ${{ parameters.stagedBuild }}
@@ -384,9 +352,7 @@ jobs:
384352
archType: arm64
385353
targetRid: android-arm64
386354
platform: Android_arm64
387-
container:
388-
image: ubuntu-18.04-android-20200422191843-e2c3f83
389-
registry: mcr
355+
container: Linux_bionic
390356
jobParameters:
391357
runtimeFlavor: mono
392358
stagedBuild: ${{ parameters.stagedBuild }}

‎eng/pipelines/common/templates/pipeline-with-resources.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
parameters:
2+
- name: stages
3+
type: stageList
4+
5+
resources:
6+
containers:
7+
- container: Linux_arm
8+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-20220907130538-70ed2e8
9+
env:
10+
ROOTFS_DIR: /crossrootfs/arm
11+
12+
- container: Linux_armv6
13+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10-20211208135931-e6e3ac4
14+
env:
15+
ROOTFS_DIR: /crossrootfs/armv6
16+
17+
- container: Linux_arm64
18+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
19+
env:
20+
ROOTFS_DIR: /crossrootfs/arm64
21+
22+
- container: Linux_musl_x64
23+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210910135845-c401c85
24+
25+
- container: Linux_musl_arm
26+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
27+
env:
28+
ROOTFS_DIR: /crossrootfs/arm
29+
30+
- container: Linux_musl_arm64
31+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
32+
env:
33+
ROOTFS_DIR: /crossrootfs/arm64
34+
# This container contains all required toolsets to build for Android and for Linux with bionic libc.
35+
36+
- container: Linux_bionic
37+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-android-20200422191843-e2c3f83
38+
39+
- container: Linux_x64
40+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2
41+
42+
- container: Linux_x86
43+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-x86-linux-20211022152824-f853169
44+
env:
45+
ROOTFS_DIR: /crossrootfs/x86
46+
47+
- container: SourceBuild_Linux_x64
48+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80
49+
50+
- container: Linux_s390x
51+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-s390x-20201102145728-d6e0352
52+
env:
53+
ROOTFS_DIR: /crossrootfs/s390x
54+
55+
- container: Linux_ppc64le
56+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-ppc64le-20220531132048-b9de666
57+
env:
58+
ROOTFS_DIR: /crossrootfs/ppc64le
59+
60+
- container: Browser_wasm
61+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20210531091624-f5c7a43
62+
63+
- container: FreeBSD_x64
64+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-12-20210917001307-f13d79e
65+
env:
66+
ROOTFS_DIR: /crossrootfs/x64
67+
68+
- container: Tizen_armel
69+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-armel-tizen-20210719212651-8b02f56
70+
env:
71+
ROOTFS_DIR: /crossrootfs/armel
72+
73+
- container: debpkg
74+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220504035737-cfdd435
75+
76+
- container: rpmpkg
77+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-rpmpkg-20210714125410-daa5116
78+
79+
stages: ${{ parameters.stages }}

‎eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ parameters:
55
osSubgroup: ''
66
container: ''
77
testGroup: ''
8-
crossrootfsDir: ''
98
liveLibrariesBuildConfig: ''
109
helixQueues: ''
1110
stagedBuild: false
@@ -23,8 +22,8 @@ parameters:
2322
enableMicrobuild: ''
2423
gatherAssetManifests: false
2524
shouldContinueOnError: false
26-
27-
25+
26+
2827
steps:
2928
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper)
3029
displayName: Build Tests
@@ -68,4 +67,4 @@ steps:
6867

6968
helixProjectArguments: '$(Build.SourcesDirectory)/src/tests/Common/helixpublishwitharcade.proj'
7069

71-
scenarios: normal
70+
scenarios: normal

‎eng/pipelines/common/templates/runtimes/run-test-job.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ parameters:
66
container: ''
77
testGroup: ''
88
crossBuild: false
9-
crossrootfsDir: ''
109
readyToRun: false
1110
liveLibrariesBuildConfig: ''
1211
crossgen2: false
@@ -40,7 +39,6 @@ jobs:
4039
container: ${{ parameters.container }}
4140
testGroup: ${{ parameters.testGroup }}
4241
crossBuild: ${{ parameters.crossBuild }}
43-
crossrootfsDir: ${{ parameters.crossrootfsDir }}
4442
stagedBuild: ${{ parameters.stagedBuild }}
4543
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
4644
helixType: 'build/tests/'

‎eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ parameters:
66
container: ''
77
testGroup: ''
88
crossBuild: false
9-
crossrootfsDir: ''
109
readyToRun: false
1110
liveLibrariesBuildConfig: ''
1211
crossgen2: false

‎eng/pipelines/common/templates/runtimes/xplat-job.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ parameters:
77
helixType: '(unspecified)'
88
container: ''
99
crossBuild: false
10-
crossrootfsDir: ''
1110
stagedBuild: false
1211
strategy: ''
1312
pool: ''

‎eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
parameters:
2+
- name: jobs
3+
type: jobList
4+
5+
extends:
6+
template: pipeline-with-resources.yml
7+
parameters:
8+
stages:
9+
- stage: Build
10+
jobs: ${{ parameters.jobs }}

0 commit comments

Comments
 (0)