Skip to content

Commit 081f4ff

Browse files
authored
[release/7.0] Fix libraries outerloop pipelines (#95011)
Fixes #87287
1 parent 0f41773 commit 081f4ff

File tree

1 file changed

+37
-44
lines changed

1 file changed

+37
-44
lines changed

Diff for: eng/pipelines/libraries/outerloop.yml

+37-44
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,10 @@ variables:
1313

1414
jobs:
1515

16-
#
17-
# CoreCLR Build
18-
#
1916
- template: /eng/pipelines/common/platform-matrix.yml
2017
parameters:
21-
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
22-
buildConfig: release
23-
platforms:
24-
- ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
25-
- windows_x64
26-
- windows_x86
27-
- ${{ if eq(variables['includeLinuxOuterloop'], true) }}:
28-
- Linux_x64
29-
- Linux_musl_x64
30-
- ${{ if eq(variables['isRollingBuild'], true) }}:
31-
- Linux_arm
32-
- Linux_arm64
33-
- Linux_musl_arm64
34-
- ${{ if eq(variables['includeOsxOuterloop'], true) }}:
35-
- OSX_arm64
36-
- OSX_x64
37-
jobParameters:
38-
testGroup: innerloop
39-
#
40-
# Libraries Build
41-
#
42-
- template: /eng/pipelines/common/platform-matrix.yml
43-
parameters:
44-
jobTemplate: /eng/pipelines/libraries/build-job.yml
18+
jobTemplate: /eng/pipelines/common/global-build-job.yml
19+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
4520
buildConfig: Release
4621
platforms:
4722
- ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
@@ -58,18 +33,24 @@ jobs:
5833
- ${{ if and(eq(variables['includeOsxOuterloop'], true), eq(variables['isRollingBuild'], true)) }}:
5934
- OSX_arm64
6035
- OSX_x64
61-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
6236
jobParameters:
63-
isOfficialBuild: ${{ variables['isOfficialBuild'] }}
64-
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
65-
runTests: true
6637
testScope: outerloop
67-
liveRuntimeBuildConfig: release
68-
38+
nameSuffix: CoreCLR_Release
39+
buildArgs: -s clr+host.native+libs+libs.tests -c $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true
40+
timeoutInMinutes: 180
41+
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
42+
# extra steps, run tests
43+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
44+
extraStepsParameters:
45+
testScope: outerloop
46+
creator: dotnet-bot
47+
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
48+
6949
- ${{ if eq(variables['isRollingBuild'], false) }}:
7050
- template: /eng/pipelines/common/platform-matrix.yml
7151
parameters:
72-
jobTemplate: /eng/pipelines/libraries/build-job.yml
52+
jobTemplate: /eng/pipelines/common/global-build-job.yml
53+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
7354
buildConfig: Debug
7455
platforms:
7556
- ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
@@ -80,27 +61,39 @@ jobs:
8061
- ${{ if eq(variables['includeOsxOuterloop'], true) }}:
8162
- OSX_arm64
8263
- OSX_x64
83-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
8464
jobParameters:
85-
isOfficialBuild: ${{ variables['isOfficialBuild'] }}
86-
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
87-
runTests: true
8865
testScope: outerloop
89-
liveRuntimeBuildConfig: release
66+
nameSuffix: CoreCLR_Release
67+
buildArgs: -s clr+host.native+libs+libs.tests -c $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true
68+
timeoutInMinutes: 180
69+
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
70+
# extra steps, run tests
71+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
72+
extraStepsParameters:
73+
testScope: outerloop
74+
creator: dotnet-bot
75+
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
9076

9177
- ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
9278
- template: /eng/pipelines/common/platform-matrix.yml
9379
parameters:
94-
jobTemplate: /eng/pipelines/libraries/build-job.yml
80+
jobTemplate: /eng/pipelines/common/global-build-job.yml
81+
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
9582
buildConfig: Release
9683
platforms:
9784
- windows_x86
9885
- ${{ if eq(variables['isRollingBuild'], true) }}:
9986
- windows_x64
100-
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
10187
jobParameters:
102-
isOfficialBuild: ${{ variables['isOfficialBuild'] }}
103-
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
10488
framework: net48
105-
runTests: true
10689
testScope: outerloop
90+
nameSuffix: NET48
91+
buildArgs: -s libs+libs.tests -c $(_BuildConfig) -testscope outerloop /p:ArchiveTests=true -f net48
92+
timeoutInMinutes: 180
93+
includeAllPlatforms: ${{ variables['isRollingBuild'] }}
94+
# extra steps, run tests
95+
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
96+
extraStepsParameters:
97+
testScope: outerloop
98+
creator: dotnet-bot
99+
extraHelixArguments: /p:BuildTargetFramework=net48

0 commit comments

Comments
 (0)