Skip to content

Commit a2f99a4

Browse files
jkoritzinskyjkoritzinsky
authoredMar 18, 2024··
Fix CoreCLR stress pipelines that run libraries tests only (#99868)
·
v10.0.0-preview.2.25163.2v9.0.0-preview.3.24172.9
1 parent 940b76b commit a2f99a4

10 files changed

+35
-29
lines changed
 

‎eng/pipelines/coreclr/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extends:
4444
#
4545
- template: /eng/pipelines/common/platform-matrix.yml
4646
parameters:
47-
jobTemplate: /eng/pipelines/common/templates/global-build-job.yml
47+
jobTemplate: /eng/pipelines/common/global-build-job.yml
4848
buildConfig: debug
4949
platforms:
5050
- linux_arm
@@ -69,7 +69,7 @@ extends:
6969
#
7070
- template: /eng/pipelines/common/platform-matrix.yml
7171
parameters:
72-
jobTemplate: /eng/pipelines/common/templates/global-build-job.yml
72+
jobTemplate: /eng/pipelines/common/global-build-job.yml
7373
buildConfig: release
7474
platforms:
7575
- linux_arm

‎eng/pipelines/coreclr/libraries-gcstress-extra.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ extends:
2222
- template: /eng/pipelines/common/platform-matrix.yml
2323
parameters:
2424
jobTemplate: /eng/pipelines/common/global-build-job.yml
25-
buildConfig: checked
25+
buildConfig: Release
2626
helixQueueGroup: libraries
2727
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
2828
platformGroup: gcstress
2929
jobParameters:
3030
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3131
timeoutInMinutes: 660
32-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
32+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3333
postBuildSteps:
3434
- template: /eng/pipelines/libraries/helix.yml
3535
parameters:

‎eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ extends:
2828
- template: /eng/pipelines/common/platform-matrix.yml
2929
parameters:
3030
jobTemplate: /eng/pipelines/common/global-build-job.yml
31-
buildConfig: checked
31+
buildConfig: release
3232
helixQueueGroup: libraries
3333
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
3434
platformGroup: gcstress
3535
jobParameters:
3636
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3737
timeoutInMinutes: 660
38-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
38+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3939
postBuildSteps:
4040
- template: /eng/pipelines/libraries/helix.yml
4141
parameters:

‎eng/pipelines/coreclr/libraries-jitstress-random.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extends:
2121
- template: /eng/pipelines/common/platform-matrix.yml
2222
parameters:
2323
jobTemplate: /eng/pipelines/common/global-build-job.yml
24-
buildConfig: checked
24+
buildConfig: Release
2525
helixQueueGroup: libraries
2626
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
2727
platforms:
@@ -34,7 +34,7 @@ extends:
3434
jobParameters:
3535
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3636
timeoutInMinutes: 360
37-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
37+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3838
postBuildSteps:
3939
- template: /eng/pipelines/libraries/helix.yml
4040
parameters:

‎eng/pipelines/coreclr/libraries-jitstress.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extends:
2121
- template: /eng/pipelines/common/platform-matrix.yml
2222
parameters:
2323
jobTemplate: /eng/pipelines/common/global-build-job.yml
24-
buildConfig: checked
24+
buildConfig: Release
2525
helixQueueGroup: libraries
2626
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
2727
platforms:
@@ -34,7 +34,7 @@ extends:
3434
jobParameters:
3535
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3636
timeoutInMinutes: 360
37-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
37+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3838
postBuildSteps:
3939
- template: /eng/pipelines/libraries/helix.yml
4040
parameters:

‎eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extends:
2121
- template: /eng/pipelines/common/platform-matrix.yml
2222
parameters:
2323
jobTemplate: /eng/pipelines/common/global-build-job.yml
24-
buildConfig: checked
24+
buildConfig: Release
2525
helixQueueGroup: libraries
2626
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
2727
platforms:
@@ -34,7 +34,7 @@ extends:
3434
jobParameters:
3535
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3636
timeoutInMinutes: 360
37-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
37+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3838
postBuildSteps:
3939
- template: /eng/pipelines/libraries/helix.yml
4040
parameters:

‎eng/pipelines/coreclr/libraries-jitstressregs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extends:
2121
- template: /eng/pipelines/common/platform-matrix.yml
2222
parameters:
2323
jobTemplate: /eng/pipelines/common/global-build-job.yml
24-
buildConfig: checked
24+
buildConfig: Release
2525
helixQueueGroup: libraries
2626
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
2727
platforms:
@@ -34,7 +34,7 @@ extends:
3434
jobParameters:
3535
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3636
timeoutInMinutes: 360
37-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
37+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3838
postBuildSteps:
3939
- template: /eng/pipelines/libraries/helix.yml
4040
parameters:

‎eng/pipelines/coreclr/libraries-pgo.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ extends:
2121
- template: /eng/pipelines/common/platform-matrix.yml
2222
parameters:
2323
jobTemplate: /eng/pipelines/common/global-build-job.yml
24-
buildConfig: checked
24+
buildConfig: Release
2525
helixQueueGroup: libraries
2626
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
2727
platforms:
2828
- windows_arm64
2929
jobParameters:
3030
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
3131
timeoutInMinutes: 660
32-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
32+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
3333
postBuildSteps:
3434
- template: /eng/pipelines/libraries/helix.yml
3535
parameters:
@@ -41,7 +41,7 @@ extends:
4141
- template: /eng/pipelines/common/platform-matrix.yml
4242
parameters:
4343
jobTemplate: /eng/pipelines/common/global-build-job.yml
44-
buildConfig: checked
44+
buildConfig: Release
4545
helixQueueGroup: libraries
4646
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
4747
platforms:
@@ -53,7 +53,7 @@ extends:
5353
jobParameters:
5454
# Default timeout is 150 minutes (2.5 hours), which is not enough for stress.
5555
timeoutInMinutes: 660
56-
buildArgs: -s clr+libs -c $(_BuildConfig) -lc Release
56+
buildArgs: -s clr+libs+libs.tests -rc Checked -c $(_BuildConfig) /p:ArchiveTests=true
5757
postBuildSteps:
5858
- template: /eng/pipelines/libraries/helix.yml
5959
parameters:

‎eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
parameters:
3535
creator: dotnet-bot
3636
testRunNamePrefixSuffix: Libraries_Release_CoreCLR
37+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
3738
condition: >-
3839
or(
3940
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -58,6 +59,7 @@ jobs:
5859
creator: dotnet-bot
5960
testRunNamePrefixSuffix: NET48_$(_BuildConfig)
6061
extraHelixArguments: /p:BuildTargetFramework=net48
62+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
6163
condition: >-
6264
or(
6365
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -87,6 +89,7 @@ jobs:
8789
nameSuffix: AllSubsets_Mono
8890
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
8991
timeoutInMinutes: 120
92+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
9093
condition: >-
9194
or(
9295
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -129,6 +132,7 @@ jobs:
129132
runtimeVariant: llvmfullaot
130133
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
131134
timeoutInMinutes: 300
135+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
132136

133137
condition: >-
134138
or(
@@ -168,6 +172,7 @@ jobs:
168172
runtimeVariant: monointerpreter
169173
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release
170174
timeoutInMinutes: 180
175+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
171176
condition: >-
172177
or(
173178
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
@@ -204,6 +209,7 @@ jobs:
204209
runtimeVariant: minijit
205210
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c Release
206211
timeoutInMinutes: 180
212+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
207213
condition: >-
208214
or(
209215
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),

‎eng/pipelines/libraries/helix-queues-setup.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
# Linux arm
2929
- ${{ if eq(parameters.platform, 'linux_arm') }}:
30-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
30+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
3131
- (Debian.11.Arm32.Open)Ubuntu.2004.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
3232

3333
# Linux armv6
@@ -37,18 +37,18 @@ jobs:
3737
# Linux arm64
3838
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
3939
- (Ubuntu.2204.Arm64.Open)Ubuntu.2004.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
40-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
40+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4141
- (Debian.11.Arm64.Open)Ubuntu.2004.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
4242

4343
# Linux musl x64
4444
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
45-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
45+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4646
- (Alpine.316.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.16-helix-amd64
47-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
47+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4848
- (Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
4949

5050
# Linux musl arm64
51-
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
51+
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
5252
- (Alpine.318.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
5353
- (Alpine.316.Arm64.Open)ubuntu.2004.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.16-helix-arm64v8
5454

@@ -62,14 +62,14 @@ jobs:
6262
- (Ubuntu.2204.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
6363
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
6464
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
65-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
65+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
6666
- SLES.15.Amd64.Open
6767
- (Fedora.38.Amd64.Open)ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
6868
- Ubuntu.2204.Amd64.Open
6969
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
7070
- (Mariner.2.0.Amd64.Open)Ubuntu.2204.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
7171
- (openSUSE.15.2.Amd64.Open)Ubuntu.2204.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
72-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
72+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
7373
- (Centos.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix
7474
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
7575
- Ubuntu.2204.Amd64.Open
@@ -124,11 +124,11 @@ jobs:
124124
- Windows.Amd64.Server2022.Open
125125
# libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop
126126
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
127-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
127+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
128128
- Windows.Amd64.Server2022.Open
129129
- ${{ if ne(parameters.jobParameters.testScope, 'outerloop') }}:
130130
- (Windows.10.Amd64.ServerRS5.Open)windows.10.amd64.serverrs5.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2019-helix-amd64
131-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
131+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
132132
- Windows.81.Amd64.Open
133133
- Windows.Amd64.Server2022.Open
134134
- Windows.11.Amd64.Client.Open
@@ -152,10 +152,10 @@ jobs:
152152
- Windows.11.Amd64.Client.Open
153153
# libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop
154154
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
155-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
155+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
156156
- Windows.11.Amd64.Client.Open
157157
- Windows.Amd64.Server2022.Open
158-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
158+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
159159
- Windows.Amd64.Server2022.Open
160160
- Windows.7.Amd64.Open
161161

0 commit comments

Comments
 (0)
Please sign in to comment.