Skip to content

Commit 69ef55e

Browse files
authored
Fix libraries outerloop builds (#39735)
* Fix libraries outerloop builds * Remove liveRuntimeBuildConfig from all configurations build to not make it wait for coreclr to run
1 parent ed6eda5 commit 69ef55e

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

eng/pipelines/libraries/base-job.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ parameters:
2020
testDisplayName: ''
2121
testScope: ''
2222
pool: ''
23+
runTests: false
2324

2425
jobs:
2526
- template: /eng/common/templates/job/job.yml
@@ -91,6 +92,9 @@ jobs:
9192
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
9293
- _runtimeDownloadPath: '$(Build.SourcesDirectory)/artifacts/transport/${{ parameters.runtimeFlavor }}'
9394
- _runtimeConfigurationArg: -rc ${{ parameters.liveRuntimeBuildConfig }}
95+
- ${{ if eq(parameters.runTests, true) }}:
96+
- _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.runtimeVariant}}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
97+
- _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
9498
- ${{ if eq(parameters.testDisplayName, '') }}:
9599
- _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}
96100
- ${{ if ne(parameters.testDisplayName, '') }}:
@@ -121,4 +125,13 @@ jobs:
121125

122126
steps:
123127
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
128+
129+
- ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
130+
- template: /eng/pipelines/common/download-artifact-step.yml
131+
parameters:
132+
unpackFolder: $(_runtimeDownloadPath)
133+
artifactFileName: '$(_runtimeArtifactName)$(archiveExtension)'
134+
artifactName: '$(_runtimeArtifactName)'
135+
displayName: '$(runtimeFlavorName) build drop'
136+
124137
- ${{ parameters.steps }}

eng/pipelines/libraries/build-job.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
4242
liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
4343
runtimeFlavor: ${{ parameters.runtimeFlavor }}
44+
runTests: ${{ parameters.runTests }}
4445
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
4546
preBuildSteps: ${{ parameters.preBuildSteps }}
4647
container: ${{ parameters.container }}
@@ -51,6 +52,11 @@ jobs:
5152
name: build
5253
displayName: 'Build'
5354

55+
${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}:
56+
dependsOn:
57+
# Use full product dependency for test runs
58+
- ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
59+
5460
variables:
5561
- librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.buildConfig) }}
5662
- _subset: libs

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
condition: ${{ parameters.condition }}
4141
pool: ${{ parameters.pool }}
4242
testScope: ${{ parameters.testScope }}
43+
runTests: true
4344
${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
4445
displayName: ${{ format('Test Run {0} {1}', parameters.liveRuntimeBuildConfig, parameters.runtimeDisplayName) }}
4546
name: ${{ format('test_run_{0}_{1}', parameters.liveRuntimeBuildConfig, parameters.runtimeDisplayName) }}
@@ -61,10 +62,6 @@ jobs:
6162
variables:
6263
- librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
6364
- _archiveTestsParameter: /p:ArchiveTests=true
64-
65-
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
66-
- _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.runtimeVariant}}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
67-
- _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
6865

6966
- ${{ parameters.variables }}
7067

@@ -84,14 +81,6 @@ jobs:
8481
artifactName: $(librariesTestsArtifactName)
8582
artifactFileName: $(librariesTestsArtifactName)$(archiveExtension)
8683
unpackFolder: $(Build.SourcesDirectory)/artifacts
87-
88-
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
89-
- template: /eng/pipelines/common/download-artifact-step.yml
90-
parameters:
91-
unpackFolder: $(_runtimeDownloadPath)
92-
artifactFileName: '$(_runtimeArtifactName)$(archiveExtension)'
93-
artifactName: '$(_runtimeArtifactName)'
94-
displayName: '$(runtimeFlavorName) build drop'
9584

9685
- ${{ if in(parameters.coreclrTestGroup, 'gcstress0x3-gcstress0xc', 'gcstress-extra') }}:
9786
# We need to find and download the GC stress dependencies (namely, coredistools). Put them

eng/pipelines/runtime.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@ jobs:
595595
isFullMatrix: ${{ variables.isFullMatrix }}
596596
framework: allConfigurations
597597
runTests: true
598-
liveRuntimeBuildConfig: release
599598
condition: >-
600599
or(
601600
eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),

0 commit comments

Comments
 (0)