Skip to content

Commit

Permalink
[release/6.0-staging] Merge #75473 (#103266)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
amanasifkhalid authored Jun 11, 2024
1 parent 318da1f commit 30900da
Show file tree
Hide file tree
Showing 68 changed files with 5,261 additions and 5,092 deletions.
3 changes: 0 additions & 3 deletions eng/pipelines/common/build-coreclr-and-libraries-job.yml
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ parameters:
osSubgroup: ''
container: ''
crossBuild: false
crossrootfsDir: ''
variables: []
targetRid: ''
timeoutInMinutes: ''
Expand Down
62 changes: 14 additions & 48 deletions eng/pipelines/common/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ jobs:
archType: arm
targetRid: linux-arm
platform: Linux_arm
container:
image: ubuntu-16.04-cross-20210719121212-8a8d3be
registry: mcr
container: Linux_arm
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -48,7 +46,6 @@ jobs:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux arm64
Expand All @@ -63,9 +60,7 @@ jobs:
archType: arm64
targetRid: linux-arm64
platform: Linux_arm64
container:
image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
registry: mcr
container: Linux_arm64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -74,7 +69,6 @@ jobs:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm64'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux musl x64
Expand All @@ -90,9 +84,7 @@ jobs:
archType: x64
targetRid: linux-musl-x64
platform: Linux_musl_x64
container:
image: alpine-3.13-WithNode-20210910135845-c401c85
registry: mcr
container: Linux_musl_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -115,9 +107,7 @@ jobs:
archType: arm
targetRid: linux-musl-arm
platform: Linux_musl_arm
container:
image: ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9
registry: mcr
container: Linux_musl_arm
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -126,7 +116,6 @@ jobs:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux musl arm64
Expand All @@ -142,9 +131,7 @@ jobs:
archType: arm64
targetRid: linux-musl-arm64
platform: Linux_musl_arm64
container:
image: ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
registry: mcr
container: Linux_musl_arm64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -153,7 +140,6 @@ jobs:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/arm64'
${{ insert }}: ${{ parameters.jobParameters }}

# Linux x64
Expand All @@ -168,9 +154,7 @@ jobs:
archType: x64
targetRid: linux-x64
platform: Linux_x64
container:
image: centos-7-20210714125435-9b5bbc2
registry: mcr
container: Linux_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -192,9 +176,7 @@ jobs:
archType: x64
targetRid: linux-x64
platform: Linux_x64
container:
image: centos-7-source-build-20210714125450-5d87b80
registry: mcr
container: SourceBuild_Linux_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -217,9 +199,7 @@ jobs:
archType: s390x
targetRid: linux-s390x
platform: Linux_s390x
container:
image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
registry: mcr
container: Linux_s390x
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -228,7 +208,6 @@ jobs:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/s390x'
${{ insert }}: ${{ parameters.jobParameters }}

# WebAssembly
Expand All @@ -244,9 +223,7 @@ jobs:
archType: wasm
targetRid: browser-wasm
platform: Browser_wasm
container:
image: ubuntu-18.04-webassembly-20210531091624-f5c7a43
registry: mcr
container: Browser_wasm
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
Expand Down Expand Up @@ -287,15 +264,12 @@ jobs:
archType: x64
targetRid: freebsd-x64
platform: FreeBSD_x64
container:
image: ubuntu-18.04-cross-freebsd-11-20200407092345-a84b0d2
registry: mcr
container: FreeBSD_x64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
crossBuild: true
crossrootfsDir: '/crossrootfs/x64'
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
${{ insert }}: ${{ parameters.jobParameters }}
Expand All @@ -312,9 +286,7 @@ jobs:
archType: x64
targetRid: android-x64
platform: Android_x64
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -336,9 +308,7 @@ jobs:
archType: x86
targetRid: android-x86
platform: Android_x86
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -360,9 +330,7 @@ jobs:
archType: arm
targetRid: android-arm
platform: Android_arm
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand All @@ -384,9 +352,7 @@ jobs:
archType: arm64
targetRid: android-arm64
platform: Android_arm64
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
registry: mcr
container: Linux_bionic
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
Expand Down
79 changes: 79 additions & 0 deletions eng/pipelines/common/templates/pipeline-with-resources.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
parameters:
- name: stages
type: stageList

resources:
containers:
- container: Linux_arm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-20220907130538-70ed2e8
env:
ROOTFS_DIR: /crossrootfs/arm

- container: Linux_armv6
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10-20211208135931-e6e3ac4
env:
ROOTFS_DIR: /crossrootfs/armv6

- container: Linux_arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
env:
ROOTFS_DIR: /crossrootfs/arm64

- container: Linux_musl_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210910135845-c401c85

- container: Linux_musl_arm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
env:
ROOTFS_DIR: /crossrootfs/arm

- container: Linux_musl_arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
env:
ROOTFS_DIR: /crossrootfs/arm64
# This container contains all required toolsets to build for Android and for Linux with bionic libc.

- container: Linux_bionic
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-android-20200422191843-e2c3f83

- container: Linux_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2

- container: Linux_x86
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-x86-linux-20211022152824-f853169
env:
ROOTFS_DIR: /crossrootfs/x86

- container: SourceBuild_Linux_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80

- container: Linux_s390x
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-s390x-20201102145728-d6e0352
env:
ROOTFS_DIR: /crossrootfs/s390x

- container: Linux_ppc64le
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-ppc64le-20220531132048-b9de666
env:
ROOTFS_DIR: /crossrootfs/ppc64le

- container: Browser_wasm
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly-20210531091624-f5c7a43

- container: FreeBSD_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-12-20210917001307-f13d79e
env:
ROOTFS_DIR: /crossrootfs/x64

- container: Tizen_armel
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-armel-tizen-20210719212651-8b02f56
env:
ROOTFS_DIR: /crossrootfs/armel

- container: debpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg-20220504035737-cfdd435

- container: rpmpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-rpmpkg-20210714125410-daa5116

stages: ${{ parameters.stages }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ parameters:
osSubgroup: ''
container: ''
testGroup: ''
crossrootfsDir: ''
liveLibrariesBuildConfig: ''
helixQueues: ''
stagedBuild: false
Expand All @@ -23,8 +22,8 @@ parameters:
enableMicrobuild: ''
gatherAssetManifests: false
shouldContinueOnError: false


steps:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper)
displayName: Build Tests
Expand Down Expand Up @@ -68,4 +67,4 @@ steps:

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

scenarios: normal
scenarios: normal
2 changes: 0 additions & 2 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ parameters:
container: ''
testGroup: ''
crossBuild: false
crossrootfsDir: ''
readyToRun: false
liveLibrariesBuildConfig: ''
crossgen2: false
Expand Down Expand Up @@ -40,7 +39,6 @@ jobs:
container: ${{ parameters.container }}
testGroup: ${{ parameters.testGroup }}
crossBuild: ${{ parameters.crossBuild }}
crossrootfsDir: ${{ parameters.crossrootfsDir }}
stagedBuild: ${{ parameters.stagedBuild }}
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
helixType: 'build/tests/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ parameters:
container: ''
testGroup: ''
crossBuild: false
crossrootfsDir: ''
readyToRun: false
liveLibrariesBuildConfig: ''
crossgen2: false
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ parameters:
helixType: '(unspecified)'
container: ''
crossBuild: false
crossrootfsDir: ''
stagedBuild: false
strategy: ''
pool: ''
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
parameters:
- name: jobs
type: jobList

extends:
template: pipeline-with-resources.yml
parameters:
stages:
- stage: Build
jobs: ${{ parameters.jobs }}
Loading

0 comments on commit 30900da

Please sign in to comment.