From dc91d8aae2766e36b3d25e582a0c19b51b425055 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sat, 16 Mar 2024 10:54:29 -0700 Subject: [PATCH 1/3] Fix CoreCLR stress pipelines that run libraries tests only --- eng/pipelines/coreclr/libraries-gcstress-extra.yml | 2 +- eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml | 2 +- eng/pipelines/coreclr/libraries-jitstress-random.yml | 2 +- eng/pipelines/coreclr/libraries-jitstress.yml | 2 +- eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml | 2 +- eng/pipelines/coreclr/libraries-jitstressregs.yml | 2 +- eng/pipelines/coreclr/libraries-pgo.yml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/coreclr/libraries-gcstress-extra.yml b/eng/pipelines/coreclr/libraries-gcstress-extra.yml index c6bc819be20ebf..0b3882230e0fa5 100644 --- a/eng/pipelines/coreclr/libraries-gcstress-extra.yml +++ b/eng/pipelines/coreclr/libraries-gcstress-extra.yml @@ -29,7 +29,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml index 90f9803f745176..f4c0c2b13e62aa 100644 --- a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml @@ -35,7 +35,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress-random.yml b/eng/pipelines/coreclr/libraries-jitstress-random.yml index b9ab14fc308044..9422fba99a632a 100644 --- a/eng/pipelines/coreclr/libraries-jitstress-random.yml +++ b/eng/pipelines/coreclr/libraries-jitstress-random.yml @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress.yml b/eng/pipelines/coreclr/libraries-jitstress.yml index 501f233f471378..f2092663471898 100644 --- a/eng/pipelines/coreclr/libraries-jitstress.yml +++ b/eng/pipelines/coreclr/libraries-jitstress.yml @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml index 9c50b8d5f45884..3b7152cec334aa 100644 --- a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstressregs.yml index 5ab04e9a27addd..7d25891e9d5cb2 100644 --- a/eng/pipelines/coreclr/libraries-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstressregs.yml @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-pgo.yml b/eng/pipelines/coreclr/libraries-pgo.yml index 2ac83670dd5121..b902459b134fae 100644 --- a/eng/pipelines/coreclr/libraries-pgo.yml +++ b/eng/pipelines/coreclr/libraries-pgo.yml @@ -29,7 +29,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: @@ -53,7 +53,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release + buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: From 0b8cae7c02ae9121e284f0b846361ecb797d1435 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sat, 16 Mar 2024 11:08:16 -0700 Subject: [PATCH 2/3] Forward isExtraPlatformsBuild --- .../extra-platforms/runtime-extra-platforms-other.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index 4b16485873a83b..dca91f4a84e77a 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -34,6 +34,7 @@ jobs: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Libraries_Release_CoreCLR + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), @@ -58,6 +59,7 @@ jobs: creator: dotnet-bot testRunNamePrefixSuffix: NET48_$(_BuildConfig) extraHelixArguments: /p:BuildTargetFramework=net48 + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), @@ -87,6 +89,7 @@ jobs: nameSuffix: AllSubsets_Mono buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), @@ -129,6 +132,7 @@ jobs: runtimeVariant: llvmfullaot buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true timeoutInMinutes: 300 + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} condition: >- or( @@ -168,6 +172,7 @@ jobs: runtimeVariant: monointerpreter buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release timeoutInMinutes: 180 + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), @@ -204,6 +209,7 @@ jobs: runtimeVariant: minijit buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release timeoutInMinutes: 180 + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), From 7d63f680fc57898afaa13b0025d6b9dbac931b79 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 17 Mar 2024 22:52:05 -0700 Subject: [PATCH 3/3] Fix incorrect jobParameters name, fix template path, use libraries configuration as the job config when running libraries tests --- eng/pipelines/coreclr/ci.yml | 4 ++-- .../coreclr/libraries-gcstress-extra.yml | 4 ++-- .../libraries-gcstress0x3-gcstress0xc.yml | 4 ++-- .../coreclr/libraries-jitstress-random.yml | 4 ++-- eng/pipelines/coreclr/libraries-jitstress.yml | 4 ++-- .../libraries-jitstress2-jitstressregs.yml | 4 ++-- .../coreclr/libraries-jitstressregs.yml | 4 ++-- eng/pipelines/coreclr/libraries-pgo.yml | 8 +++---- .../libraries/helix-queues-setup.yml | 22 +++++++++---------- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index 8ce9cf6a4deed8..c07ebacbf30f52 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -44,7 +44,7 @@ extends: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/global-build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: debug platforms: - linux_arm @@ -69,7 +69,7 @@ extends: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/global-build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - linux_arm diff --git a/eng/pipelines/coreclr/libraries-gcstress-extra.yml b/eng/pipelines/coreclr/libraries-gcstress-extra.yml index 0b3882230e0fa5..433f00e859e64e 100644 --- a/eng/pipelines/coreclr/libraries-gcstress-extra.yml +++ b/eng/pipelines/coreclr/libraries-gcstress-extra.yml @@ -22,14 +22,14 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platformGroup: gcstress jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml index f4c0c2b13e62aa..e98ce3fa581f95 100644 --- a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml @@ -28,14 +28,14 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platformGroup: gcstress jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress-random.yml b/eng/pipelines/coreclr/libraries-jitstress-random.yml index 9422fba99a632a..3514f4d624a954 100644 --- a/eng/pipelines/coreclr/libraries-jitstress-random.yml +++ b/eng/pipelines/coreclr/libraries-jitstress-random.yml @@ -21,7 +21,7 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platforms: @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress.yml b/eng/pipelines/coreclr/libraries-jitstress.yml index f2092663471898..1ac2c5b34dc0e1 100644 --- a/eng/pipelines/coreclr/libraries-jitstress.yml +++ b/eng/pipelines/coreclr/libraries-jitstress.yml @@ -21,7 +21,7 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platforms: @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml index 3b7152cec334aa..83d8e131c6d75f 100644 --- a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml @@ -21,7 +21,7 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platforms: @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstressregs.yml index 7d25891e9d5cb2..48c1aa93d08c02 100644 --- a/eng/pipelines/coreclr/libraries-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstressregs.yml @@ -21,7 +21,7 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platforms: @@ -34,7 +34,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 360 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-pgo.yml b/eng/pipelines/coreclr/libraries-pgo.yml index b902459b134fae..a8f0e16b01f35c 100644 --- a/eng/pipelines/coreclr/libraries-pgo.yml +++ b/eng/pipelines/coreclr/libraries-pgo.yml @@ -21,7 +21,7 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platforms: @@ -29,7 +29,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: @@ -41,7 +41,7 @@ extends: - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: checked + buildConfig: Release helixQueueGroup: libraries helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml platforms: @@ -53,7 +53,7 @@ extends: jobParameters: # Default timeout is 150 minutes (2.5 hours), which is not enough for stress. timeoutInMinutes: 660 - buildArgs: -s clr+libs+libs.tests -rc $(_BuildConfig) -c Release /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true postBuildSteps: - template: /eng/pipelines/libraries/helix.yml parameters: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 6baf34455ee792..91b1c9d1d55ef9 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -27,7 +27,7 @@ jobs: # Linux arm - ${{ if eq(parameters.platform, 'linux_arm') }}: - - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Debian.11.Arm32.Open)Ubuntu.2004.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7 # Linux armv6 @@ -37,18 +37,18 @@ jobs: # Linux arm64 - ${{ if eq(parameters.platform, 'linux_arm64') }}: - (Ubuntu.2204.Arm64.Open)Ubuntu.2004.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8 - - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Debian.11.Arm64.Open)Ubuntu.2004.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8 # Linux musl x64 - ${{ if eq(parameters.platform, 'linux_musl_x64') }}: - - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.316.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.16-helix-amd64 - - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64 # Linux musl arm64 - - ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}: + - ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}: - (Alpine.318.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8 - (Alpine.316.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.16-helix-arm64v8 @@ -62,14 +62,14 @@ jobs: - (Ubuntu.2204.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64 - (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - SLES.15.Amd64.Open - (Fedora.38.Amd64.Open)ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix - Ubuntu.2204.Amd64.Open - (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - (Mariner.2.0.Amd64.Open)Ubuntu.2204.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64 - (openSUSE.15.2.Amd64.Open)Ubuntu.2204.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64 - - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Centos.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix - (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - Ubuntu.2204.Amd64.Open @@ -124,11 +124,11 @@ jobs: - Windows.Amd64.Server2022.Open # libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - Windows.Amd64.Server2022.Open - ${{ if ne(parameters.jobParameters.testScope, 'outerloop') }}: - (Windows.10.Amd64.ServerRS5.Open)windows.10.amd64.serverrs5.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2019-helix-amd64 - - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - Windows.81.Amd64.Open - Windows.Amd64.Server2022.Open - Windows.11.Amd64.Client.Open @@ -152,10 +152,10 @@ jobs: - Windows.11.Amd64.Client.Open # libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - Windows.11.Amd64.Client.Open - Windows.Amd64.Server2022.Open - - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: + - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - Windows.Amd64.Server2022.Open - Windows.7.Amd64.Open