Skip to content

Commit f621f44

Browse files
trylektrylek
authored
Switch over CoreCLR pr.yml to use live-built libraries (#520)
* Switch over CoreCLR pr.yml to use live-built libraries * Delete CoreFX runs against CoreCLR * PR feedback - only use release CoreFX builds for CoreCLR testing
1 parent d49fc9e commit f621f44

9 files changed

Lines changed: 44 additions & 32 deletions

File tree

‎eng/pipelines/common/xplat-setup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
# This is only required for cross builds.
4545
- name: ROOTFS_DIR
4646
value: ${{ parameters.jobParameters.crossrootfsDir }}
47-
47+
4848
osGroup: ${{ parameters.osGroup }}
4949
osSubgroup: ${{ parameters.osSubgroup }}
50-
archType: ${{ parameters.archType }}
50+
archType: ${{ parameters.archType }}
5151

5252
${{ if ne(parameters.container, '') }}:
5353
${{ if eq(parameters.container.registry, 'mcr') }}:

‎eng/pipelines/coreclr/pr.yml‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,80 +80,87 @@ jobs:
8080
testGroup: innerloop
8181

8282
#
83-
# Checked test builds
83+
# Release library builds
8484
#
8585
- template: /eng/pipelines/common/platform-matrix.yml
8686
parameters:
87-
jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml
88-
buildConfig: checked
87+
jobTemplate: /eng/pipelines/libraries/build-job.yml
88+
buildConfig: Release
8989
platforms:
9090
- Linux_arm
9191
- Linux_arm64
92+
- Linux_musl_x64
93+
- Linux_x64
9294
- OSX_x64
9395
- Windows_NT_arm
9496
- Windows_NT_arm64
9597
- Windows_NT_x64
9698
- Windows_NT_x86
9799
jobParameters:
98-
testGroup: innerloop
100+
isOfficialBuild: false
101+
liveCoreClrBuildConfig: checked
99102

100103
#
101-
# Checked JIT test executions
104+
# Checked test builds
102105
#
103106
- template: /eng/pipelines/common/platform-matrix.yml
104107
parameters:
105-
jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml
108+
jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml
106109
buildConfig: checked
107110
platforms:
108111
- Linux_arm
109112
- Linux_arm64
110-
- Linux_musl_x64
111-
- Linux_x64
112113
- OSX_x64
113114
- Windows_NT_arm
114115
- Windows_NT_arm64
115116
- Windows_NT_x64
116117
- Windows_NT_x86
117-
helixQueueGroup: pr
118-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
119118
jobParameters:
120119
testGroup: innerloop
120+
liveLibrariesBuildConfig: Release
121121

122122
#
123-
# Checked R2R test executions
123+
# Checked JIT test executions
124124
#
125125
- template: /eng/pipelines/common/platform-matrix.yml
126126
parameters:
127127
jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml
128128
buildConfig: checked
129129
platforms:
130+
- Linux_arm
131+
- Linux_arm64
132+
- Linux_musl_x64
130133
- Linux_x64
131134
- OSX_x64
135+
- Windows_NT_arm
136+
- Windows_NT_arm64
132137
- Windows_NT_x64
133138
- Windows_NT_x86
134139
helixQueueGroup: pr
135140
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
136141
jobParameters:
137142
testGroup: innerloop
138-
readyToRun: true
139-
displayNameArgs: R2R
143+
liveLibrariesBuildConfig: Release
140144

141145
#
142-
# CoreFX test runs against CoreCLR
146+
# Checked R2R test executions
143147
#
144148
- template: /eng/pipelines/common/platform-matrix.yml
145149
parameters:
146150
jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml
147151
buildConfig: checked
148152
platforms:
149153
- Linux_x64
154+
- OSX_x64
150155
- Windows_NT_x64
156+
- Windows_NT_x86
151157
helixQueueGroup: pr
152158
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
153159
jobParameters:
154160
testGroup: innerloop
155-
corefxTests: true
156-
displayNameArgs: CoreFX
161+
readyToRun: true
162+
displayNameArgs: R2R
163+
liveLibrariesBuildConfig: Release
157164

158165
#
159166
# Crossgen-comparison jobs
@@ -178,6 +185,7 @@ jobs:
178185
- OSX_x64
179186
jobParameters:
180187
testGroup: innerloop
188+
liveLibrariesBuildConfig: Release
181189

182190
#
183191
# Release test builds
@@ -192,6 +200,7 @@ jobs:
192200
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
193201
jobParameters:
194202
testGroup: innerloop
203+
liveLibrariesBuildConfig: Release
195204

196205
#
197206
# Formatting

‎eng/pipelines/coreclr/templates/build-test-job.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
parameters:
9595
unpackFolder: $(librariesDownloadDir)
9696
cleanUnpackFolder: false
97-
artifactFileName: '$(librariesArtifactName)$(archiveExtension)'
98-
artifactName: '$(librariesArtifactName)'
97+
artifactFileName: '$(librariesBuildArtifactName)$(archiveExtension)'
98+
artifactName: '$(librariesBuildArtifactName)'
9999
displayName: 'live-built libraries'
100100

101101

‎eng/pipelines/coreclr/templates/run-test-job.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ jobs:
114114
parameters:
115115
unpackFolder: $(librariesDownloadDir)
116116
cleanUnpackFolder: false
117-
artifactFileName: '$(librariesArtifactName)$(archiveExtension)'
118-
artifactName: '$(librariesArtifactName)'
117+
artifactFileName: '$(librariesBuildArtifactName)$(archiveExtension)'
118+
artifactName: '$(librariesBuildArtifactName)'
119119
displayName: 'live-built libraries'
120120

121121

‎eng/pipelines/coreclr/templates/xplat-pipeline-job.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ jobs:
104104
- name: priorityArg
105105
value: '-priority=1'
106106

107-
- librariesArtifactName: ''
107+
- librariesBuildArtifactName: ''
108108
- librariesOverrideArg: ''
109109
- librariesDownloadDir: ''
110110

111111
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
112-
- librariesArtifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
112+
- librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
113113
- librariesDownloadDir: $(Build.SourcesDirectory)/artifacts
114114
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
115115
- librariesOverrideArg: ' localcorefxpath $(Build.SourcesDirectory) localcorefxconfig ${{ parameters.liveLibrariesBuildConfig }}'

‎eng/pipelines/libraries/base-job.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ jobs:
6464
- ${{ if eq(parameters.isOfficialBuild, 'true') }}:
6565
- _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)
6666

67+
- librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
68+
- librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
69+
6770
- _coreClrArtifactName: ''
6871
- _coreClrDownloadPath: ''
6972
- _coreClrOverridePathArg: ''

‎eng/pipelines/libraries/build-job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
archiveType: $(archiveType)
131131
archiveExtension: $(archiveExtension)
132132
tarCompression: $(tarCompression)
133-
artifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
133+
artifactName: $(librariesBuildArtifactName)
134134
displayName: Build Assets
135135

136136
- ${{ if eq(parameters.runTests, true) }}:

‎eng/pipelines/libraries/build-test-job.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
- template: /eng/pipelines/common/download-artifact-step.yml
4747
parameters:
4848
displayName: Build Assets
49-
artifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
50-
artifactFileName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}$(archiveExtension)
49+
artifactName: $(librariesBuildArtifactName)
50+
artifactFileName: $(librariesBuildArtifactName)$(archiveExtension)
5151
unpackFolder: $(Build.SourcesDirectory)/artifacts
5252
cleanUnpackFolder: false
5353

@@ -67,5 +67,5 @@ jobs:
6767
archiveType: $(archiveType)
6868
archiveExtension: $(archiveExtension)
6969
tarCompression: $(tarCompression)
70-
artifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.archType, parameters.buildConfig) }}
70+
artifactName: $(librariesTestsArtifactName)
7171
displayName: Test Assets

‎eng/pipelines/libraries/run-test-job.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ jobs:
4444
- template: /eng/pipelines/common/download-artifact-step.yml
4545
parameters:
4646
displayName: Build Assets
47-
artifactName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
48-
artifactFileName: ${{ format('libraries_bin_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}$(archiveExtension)
47+
artifactName: $(librariesBuildArtifactName)
48+
artifactFileName: $(librariesBuildArtifactName)$(archiveExtension)
4949
unpackFolder: $(Build.SourcesDirectory)/artifacts
5050

5151
- template: /eng/pipelines/common/download-artifact-step.yml
5252
parameters:
5353
displayName: Test Assets
5454
cleanUnpackFolder: false
5555
unpackFolder: $(Build.SourcesDirectory)/artifacts
56-
artifactName: ${{ format('libraries_test_assets_{0}_{1}_x64_{2}', parameters.framework, parameters.osGroup, parameters.dependsOnBuildConfiguration) }}
57-
artifactFileName: ${{ format('libraries_test_assets_{0}_{1}_x64_{2}', parameters.framework, parameters.osGroup, parameters.dependsOnBuildConfiguration) }}$(archiveExtension)
56+
artifactName: $(librariesTestsArtifactName)
57+
artifactFileName: $(librariesTestsArtifactName)$(archiveExtension)
5858

5959
- template: /eng/pipelines/libraries/helix.yml
6060
parameters:

0 commit comments

Comments
 (0)