Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use AzDO Pipeline Resources to define our build Docker containers #75473

Merged
merged 4 commits into from
Oct 7, 2022
Merged

Use AzDO Pipeline Resources to define our build Docker containers #75473

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faee2c3
Refactor all of the docker images we use in our build into AzDO conta…
jkoritzinsky Sep 12, 2022
47c7378
Fix bad diffs
jkoritzinsky Oct 4, 2022
3ce2aaf
Add spacing
jkoritzinsky Oct 4, 2022
948f983
Merge branch 'main' into pipeline-container-resources
jkoritzinsky Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/workflow/building/coreclr/linux-instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Note that instructions on building the crossrootfs location can be found at [cro
Docker Images
=============

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.
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.

| OS | Target Arch | Image location | crossrootfs location | Clang Version |
| --------------------------- | --------------- | ---------------------------------------------------------------------------------------------------- | -------------------- | ------------- |
Expand Down
3 changes: 0 additions & 3 deletions eng/pipelines/common/build-coreclr-and-libraries-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ parameters:
container: ''
testGroup: ''
crossBuild: false
crossrootfsDir: ''
timeoutInMinutes: ''
signBinaries: false
stagedBuild: false
Expand All @@ -27,7 +26,6 @@ jobs:
container: ${{ parameters.container }}
testGroup: ${{ parameters.testGroup }}
crossBuild: ${{ parameters.crossBuild }}
crossrootfsDir: ${{ parameters.crossrootfsDir }}
timeoutInminutes: ${{ parameters.timeoutInMinutes }}
signBinaries: ${{ parameters.signBinaries }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -46,7 +44,6 @@ jobs:
container: ${{ parameters.container }}
testGroup: ${{ parameters.testGroup }}
crossBuild: ${{ parameters.crossBuild }}
crossrootfsDir: ${{ parameters.crossrootfsDir }}
timeoutInminutes: ${{ parameters.timeoutInMinutes }}
variables: ${{ parameters.variables }}
pool: ${{ parameters.pool }}
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/common/global-build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ parameters:
osSubgroup: ''
container: ''
crossBuild: false
crossrootfsDir: ''
variables: []
targetRid: ''
timeoutInMinutes: ''
Expand Down
106 changes: 29 additions & 77 deletions eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,13 @@ jobs:
targetRid: linux-arm
platform: Linux_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-arm-20220907130538-70ed2e8
registry: mcr
container: Linux_arm
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux armv6
Expand All @@ -60,16 +57,13 @@ jobs:
targetRid: linux-armv6
platform: Linux_armv6
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-20.04-cross-armv6-raspbian-10-20211208135931-e6e3ac4
registry: mcr
container: Linux_armv6
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/armv6'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux arm64
Expand All @@ -85,19 +79,18 @@ jobs:
targetRid: linux-arm64
platform: Linux_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
${{ if eq(parameters.container, '') }}:
image: ubuntu-18.04-cross-arm64-20220907130538-70ed2e8
${{ if ne(parameters.container, '') }}:
${{ if eq(parameters.container, '') }}:
container: Linux_arm64
${{ if ne(parameters.container, '') }}:
container:
image: ${{ parameters.container }}
registry: mcr
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm64'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux musl x64
Expand All @@ -114,9 +107,7 @@ jobs:
targetRid: linux-musl-x64
platform: Linux_musl_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: alpine-3.13-WithNode-20210910135845-c401c85
registry: mcr
container: Linux_musl_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -138,16 +129,13 @@ jobs:
targetRid: linux-musl-arm
platform: Linux_musl_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
registry: mcr
container: Linux_musl_arm
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux musl arm64
Expand All @@ -164,16 +152,13 @@ jobs:
targetRid: linux-musl-arm64
platform: Linux_musl_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-22.04-cross-arm64-alpine-20220915142421-44c622d
registry: mcr
container: Linux_musl_arm64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm64'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux Bionic arm64
Expand All @@ -190,9 +175,7 @@ jobs:
targetRid: linux-bionic-arm64
platform: Linux_bionic_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220808192756-8fcaabc
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
# We build on Linux, but the test queue runs Windows, so
Expand All @@ -217,9 +200,7 @@ jobs:
targetRid: linux-bionic-x64
platform: Linux_bionic_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220808192756-8fcaabc
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -240,12 +221,12 @@ jobs:
targetRid: linux-x64
platform: Linux_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
${{ if eq(parameters.container, '') }}:
image: centos-7-20210714125435-9b5bbc2
${{ if ne(parameters.container, '') }}:
${{ if eq(parameters.container, '') }}:
container: Linux_x64
${{ if ne(parameters.container, '') }}:
container:
image: ${{ parameters.container }}
registry: mcr
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -266,16 +247,13 @@ jobs:
targetRid: linux-x86
platform: Linux_x86
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-x86-linux-20211022152824-f853169
registry: mcr
container: Linux_x86
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/x86'
disableClrTest: true
${{ insert }}: ${{ parameters.jobParameters }}

Expand All @@ -292,9 +270,7 @@ jobs:
targetRid: linux-x64
platform: Linux_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: centos-7-source-build-20210714125450-5d87b80
registry: mcr
container: SourceBuild_Linux_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -316,16 +292,13 @@ jobs:
targetRid: linux-s390x
platform: Linux_s390x
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
registry: mcr
container: Linux_s390x
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/s390x'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux PPC64le
Expand All @@ -341,16 +314,13 @@ jobs:
targetRid: linux-ppc64le
platform: Linux_ppc64le
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-ppc64le-20220531132048-b9de666
registry: mcr
container: Linux_ppc64le
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/ppc64le'
${{ insert }}: ${{ parameters.jobParameters }}

# WebAssembly
Expand All @@ -366,9 +336,7 @@ jobs:
targetRid: browser-wasm
platform: Browser_wasm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-webassembly-20220531132048-00a561c
registry: mcr
container: Browser_wasm
jobParameters:
hostedOs: Linux
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand All @@ -389,9 +357,7 @@ jobs:
targetRid: browser-wasm
platform: Browser_wasm_firefox
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-webassembly-20220531132048-00a561c
registry: mcr
container: Browser_wasm
jobParameters:
hostedOs: Linux
runtimeFlavor: ${{ parameters.runtimeFlavor }}
Expand Down Expand Up @@ -431,15 +397,12 @@ jobs:
targetRid: freebsd-x64
platform: FreeBSD_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-freebsd-12-20210917001307-f13d79e
registry: mcr
container: FreeBSD_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/x64'
${{ insert }}: ${{ parameters.jobParameters }}

# Android x64
Expand All @@ -455,9 +418,7 @@ jobs:
targetRid: android-x64
platform: Android_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220808192756-8fcaabc
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -478,9 +439,7 @@ jobs:
targetRid: android-x86
platform: Android_x86
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220808192756-8fcaabc
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -501,9 +460,7 @@ jobs:
targetRid: android-arm
platform: Android_arm
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220808192756-8fcaabc
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -524,9 +481,7 @@ jobs:
targetRid: android-arm64
platform: Android_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-android-20220808192756-8fcaabc
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand Down Expand Up @@ -789,16 +744,13 @@ jobs:
targetRid: tizen-armel
platform: Tizen_armel
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: ubuntu-18.04-cross-armel-tizen-20210719212651-8b02f56
registry: mcr
container: Tizen_armel
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/armel'
disableClrTest: true
${{ insert }}: ${{ parameters.jobParameters }}

Expand Down
Loading