Skip to content

Commit 3c99def

Browse files
jkoritzinskyjkoritzinsky
authored
Use AzDO Pipeline Resources to define our build Docker containers (#75473)
1 parent 3e600c9 commit 3c99def

File tree

84 files changed

+5351
-5169
lines changed

Some content is hidden

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

84 files changed

+5351
-5169
lines changed

‎docs/workflow/building/coreclr/linux-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Note that instructions on building the crossrootfs location can be found at [cro
4545
Docker Images
4646
=============
4747

48-
This table of images might often become stale as we change our images as our requirements change. The images used for our our official builds can be found in [the platform matrix](../../../../eng/pipelines/common/platform-matrix.yml) of our Azure DevOps builds under the `container` key of the platform you plan to build.
48+
This table of images might often become stale as we change our images as our requirements change. The images used for our our official builds can be found in [the pipeline resources](../../../../eng/pipelines/common/templates/pipeline-with-resources.yml) of our Azure DevOps builds under the `container` key of the platform you plan to build.
4949

5050
| OS | Target Arch | Image location | crossrootfs location | Clang Version |
5151
| --------------------------- | --------------- | ---------------------------------------------------------------------------------------------------- | -------------------- | ------------- |

‎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
@@ -8,7 +8,6 @@ parameters:
88
osSubgroup: ''
99
container: ''
1010
crossBuild: false
11-
crossrootfsDir: ''
1211
variables: []
1312
targetRid: ''
1413
timeoutInMinutes: ''

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

Lines changed: 29 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,13 @@ jobs:
3636
targetRid: linux-arm
3737
platform: Linux_arm
3838
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
39-
container:
40-
image: ubuntu-18.04-cross-arm-20220907130538-70ed2e8
41-
registry: mcr
39+
container: Linux_arm
4240
jobParameters:
4341
runtimeFlavor: ${{ parameters.runtimeFlavor }}
4442
stagedBuild: ${{ parameters.stagedBuild }}
4543
buildConfig: ${{ parameters.buildConfig }}
4644
helixQueueGroup: ${{ parameters.helixQueueGroup }}
4745
crossBuild: true
48-
crossrootfsDir: '/crossrootfs/arm'
4946
${{ insert }}: ${{ parameters.jobParameters }}
5047

5148
# Linux armv6
@@ -60,16 +57,13 @@ jobs:
6057
targetRid: linux-armv6
6158
platform: Linux_armv6
6259
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
63-
container:
64-
image: ubuntu-20.04-cross-armv6-raspbian-10-20211208135931-e6e3ac4
65-
registry: mcr
60+
container: Linux_armv6
6661
jobParameters:
6762
runtimeFlavor: ${{ parameters.runtimeFlavor }}
6863
stagedBuild: ${{ parameters.stagedBuild }}
6964
buildConfig: ${{ parameters.buildConfig }}
7065
helixQueueGroup: ${{ parameters.helixQueueGroup }}
7166
crossBuild: true
72-
crossrootfsDir: '/crossrootfs/armv6'
7367
${{ insert }}: ${{ parameters.jobParameters }}
7468

7569
# Linux arm64
@@ -85,19 +79,18 @@ jobs:
8579
targetRid: linux-arm64
8680
platform: Linux_arm64
8781
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
88-
container:
89-
${{ if eq(parameters.container, '') }}:
90-
image: ubuntu-18.04-cross-arm64-20220907130538-70ed2e8
91-
${{ if ne(parameters.container, '') }}:
82+
${{ if eq(parameters.container, '') }}:
83+
container: Linux_arm64
84+
${{ if ne(parameters.container, '') }}:
85+
container:
9286
image: ${{ parameters.container }}
93-
registry: mcr
87+
registry: mcr
9488
jobParameters:
9589
runtimeFlavor: ${{ parameters.runtimeFlavor }}
9690
stagedBuild: ${{ parameters.stagedBuild }}
9791
buildConfig: ${{ parameters.buildConfig }}
9892
helixQueueGroup: ${{ parameters.helixQueueGroup }}
9993
crossBuild: true
100-
crossrootfsDir: '/crossrootfs/arm64'
10194
${{ insert }}: ${{ parameters.jobParameters }}
10295

10396
# Linux musl x64
@@ -114,9 +107,7 @@ jobs:
114107
targetRid: linux-musl-x64
115108
platform: Linux_musl_x64
116109
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
117-
container:
118-
image: alpine-3.13-WithNode-20210910135845-c401c85
119-
registry: mcr
110+
container: Linux_musl_x64
120111
jobParameters:
121112
runtimeFlavor: ${{ parameters.runtimeFlavor }}
122113
stagedBuild: ${{ parameters.stagedBuild }}
@@ -138,16 +129,13 @@ jobs:
138129
targetRid: linux-musl-arm
139130
platform: Linux_musl_arm
140131
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
141-
container:
142-
image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
143-
registry: mcr
132+
container: Linux_musl_arm
144133
jobParameters:
145134
runtimeFlavor: ${{ parameters.runtimeFlavor }}
146135
stagedBuild: ${{ parameters.stagedBuild }}
147136
buildConfig: ${{ parameters.buildConfig }}
148137
helixQueueGroup: ${{ parameters.helixQueueGroup }}
149138
crossBuild: true
150-
crossrootfsDir: '/crossrootfs/arm'
151139
${{ insert }}: ${{ parameters.jobParameters }}
152140

153141
# Linux musl arm64
@@ -164,16 +152,13 @@ jobs:
164152
targetRid: linux-musl-arm64
165153
platform: Linux_musl_arm64
166154
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
167-
container:
168-
image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
169-
registry: mcr
155+
container: Linux_musl_arm64
170156
jobParameters:
171157
runtimeFlavor: ${{ parameters.runtimeFlavor }}
172158
stagedBuild: ${{ parameters.stagedBuild }}
173159
buildConfig: ${{ parameters.buildConfig }}
174160
helixQueueGroup: ${{ parameters.helixQueueGroup }}
175161
crossBuild: true
176-
crossrootfsDir: '/crossrootfs/arm64'
177162
${{ insert }}: ${{ parameters.jobParameters }}
178163

179164
# Linux Bionic arm64
@@ -190,9 +175,7 @@ jobs:
190175
targetRid: linux-bionic-arm64
191176
platform: Linux_bionic_arm64
192177
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
193-
container:
194-
image: ubuntu-18.04-android-20220808192756-8fcaabc
195-
registry: mcr
178+
container: Linux_bionic
196179
jobParameters:
197180
runtimeFlavor: mono
198181
# We build on Linux, but the test queue runs Windows, so
@@ -217,9 +200,7 @@ jobs:
217200
targetRid: linux-bionic-x64
218201
platform: Linux_bionic_x64
219202
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
220-
container:
221-
image: ubuntu-18.04-android-20220808192756-8fcaabc
222-
registry: mcr
203+
container: Linux_bionic
223204
jobParameters:
224205
runtimeFlavor: mono
225206
stagedBuild: ${{ parameters.stagedBuild }}
@@ -240,12 +221,12 @@ jobs:
240221
targetRid: linux-x64
241222
platform: Linux_x64
242223
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
243-
container:
244-
${{ if eq(parameters.container, '') }}:
245-
image: centos-7-20210714125435-9b5bbc2
246-
${{ if ne(parameters.container, '') }}:
224+
${{ if eq(parameters.container, '') }}:
225+
container: Linux_x64
226+
${{ if ne(parameters.container, '') }}:
227+
container:
247228
image: ${{ parameters.container }}
248-
registry: mcr
229+
registry: mcr
249230
jobParameters:
250231
runtimeFlavor: ${{ parameters.runtimeFlavor }}
251232
stagedBuild: ${{ parameters.stagedBuild }}
@@ -266,16 +247,13 @@ jobs:
266247
targetRid: linux-x86
267248
platform: Linux_x86
268249
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
269-
container:
270-
image: ubuntu-18.04-cross-x86-linux-20211022152824-f853169
271-
registry: mcr
250+
container: Linux_x86
272251
jobParameters:
273252
runtimeFlavor: ${{ parameters.runtimeFlavor }}
274253
stagedBuild: ${{ parameters.stagedBuild }}
275254
buildConfig: ${{ parameters.buildConfig }}
276255
helixQueueGroup: ${{ parameters.helixQueueGroup }}
277256
crossBuild: true
278-
crossrootfsDir: '/crossrootfs/x86'
279257
disableClrTest: true
280258
${{ insert }}: ${{ parameters.jobParameters }}
281259

@@ -342,9 +320,7 @@ jobs:
342320
targetRid: linux-x64
343321
platform: Linux_x64
344322
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
345-
container:
346-
image: centos-7-source-build-20210714125450-5d87b80
347-
registry: mcr
323+
container: SourceBuild_Linux_x64
348324
jobParameters:
349325
runtimeFlavor: ${{ parameters.runtimeFlavor }}
350326
stagedBuild: ${{ parameters.stagedBuild }}
@@ -367,16 +343,13 @@ jobs:
367343
targetRid: linux-s390x
368344
platform: Linux_s390x
369345
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
370-
container:
371-
image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
372-
registry: mcr
346+
container: Linux_s390x
373347
jobParameters:
374348
runtimeFlavor: ${{ parameters.runtimeFlavor }}
375349
stagedBuild: ${{ parameters.stagedBuild }}
376350
buildConfig: ${{ parameters.buildConfig }}
377351
helixQueueGroup: ${{ parameters.helixQueueGroup }}
378352
crossBuild: true
379-
crossrootfsDir: '/crossrootfs/s390x'
380353
${{ insert }}: ${{ parameters.jobParameters }}
381354

382355
# Linux PPC64le
@@ -392,16 +365,13 @@ jobs:
392365
targetRid: linux-ppc64le
393366
platform: Linux_ppc64le
394367
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
395-
container:
396-
image: ubuntu-18.04-cross-ppc64le-20220531132048-b9de666
397-
registry: mcr
368+
container: Linux_ppc64le
398369
jobParameters:
399370
runtimeFlavor: ${{ parameters.runtimeFlavor }}
400371
stagedBuild: ${{ parameters.stagedBuild }}
401372
buildConfig: ${{ parameters.buildConfig }}
402373
helixQueueGroup: ${{ parameters.helixQueueGroup }}
403374
crossBuild: true
404-
crossrootfsDir: '/crossrootfs/ppc64le'
405375
${{ insert }}: ${{ parameters.jobParameters }}
406376

407377
# WebAssembly
@@ -417,9 +387,7 @@ jobs:
417387
targetRid: browser-wasm
418388
platform: Browser_wasm
419389
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
420-
container:
421-
image: ubuntu-18.04-webassembly-20220531132048-00a561c
422-
registry: mcr
390+
container: Browser_wasm
423391
jobParameters:
424392
hostedOs: Linux
425393
runtimeFlavor: ${{ parameters.runtimeFlavor }}
@@ -440,9 +408,7 @@ jobs:
440408
targetRid: browser-wasm
441409
platform: Browser_wasm_firefox
442410
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
443-
container:
444-
image: ubuntu-18.04-webassembly-20220531132048-00a561c
445-
registry: mcr
411+
container: Browser_wasm
446412
jobParameters:
447413
hostedOs: Linux
448414
runtimeFlavor: ${{ parameters.runtimeFlavor }}
@@ -482,15 +448,12 @@ jobs:
482448
targetRid: freebsd-x64
483449
platform: FreeBSD_x64
484450
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
485-
container:
486-
image: ubuntu-18.04-cross-freebsd-12-20210917001307-f13d79e
487-
registry: mcr
451+
container: FreeBSD_x64
488452
jobParameters:
489453
runtimeFlavor: ${{ parameters.runtimeFlavor }}
490454
buildConfig: ${{ parameters.buildConfig }}
491455
helixQueueGroup: ${{ parameters.helixQueueGroup }}
492456
crossBuild: true
493-
crossrootfsDir: '/crossrootfs/x64'
494457
${{ insert }}: ${{ parameters.jobParameters }}
495458

496459
# Android x64
@@ -506,9 +469,7 @@ jobs:
506469
targetRid: android-x64
507470
platform: Android_x64
508471
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
509-
container:
510-
image: ubuntu-18.04-android-20220808192756-8fcaabc
511-
registry: mcr
472+
container: Linux_bionic
512473
jobParameters:
513474
runtimeFlavor: mono
514475
stagedBuild: ${{ parameters.stagedBuild }}
@@ -529,9 +490,7 @@ jobs:
529490
targetRid: android-x86
530491
platform: Android_x86
531492
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
532-
container:
533-
image: ubuntu-18.04-android-20220808192756-8fcaabc
534-
registry: mcr
493+
container: Linux_bionic
535494
jobParameters:
536495
runtimeFlavor: mono
537496
stagedBuild: ${{ parameters.stagedBuild }}
@@ -552,9 +511,7 @@ jobs:
552511
targetRid: android-arm
553512
platform: Android_arm
554513
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
555-
container:
556-
image: ubuntu-18.04-android-20220808192756-8fcaabc
557-
registry: mcr
514+
container: Linux_bionic
558515
jobParameters:
559516
runtimeFlavor: mono
560517
stagedBuild: ${{ parameters.stagedBuild }}
@@ -575,9 +532,7 @@ jobs:
575532
targetRid: android-arm64
576533
platform: Android_arm64
577534
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
578-
container:
579-
image: ubuntu-18.04-android-20220808192756-8fcaabc
580-
registry: mcr
535+
container: Linux_bionic
581536
jobParameters:
582537
runtimeFlavor: mono
583538
stagedBuild: ${{ parameters.stagedBuild }}
@@ -840,16 +795,13 @@ jobs:
840795
targetRid: tizen-armel
841796
platform: Tizen_armel
842797
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
843-
container:
844-
image: ubuntu-18.04-cross-armel-tizen-20210719212651-8b02f56
845-
registry: mcr
798+
container: Tizen_armel
846799
jobParameters:
847800
runtimeFlavor: ${{ parameters.runtimeFlavor }}
848801
stagedBuild: ${{ parameters.stagedBuild }}
849802
buildConfig: ${{ parameters.buildConfig }}
850803
helixQueueGroup: ${{ parameters.helixQueueGroup }}
851804
crossBuild: true
852-
crossrootfsDir: '/crossrootfs/armel'
853805
disableClrTest: true
854806
${{ insert }}: ${{ parameters.jobParameters }}
855807

0 commit comments

Comments
 (0)