From e412f700689b3d6a13c9fa0e0b7c0fafd28dfa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 20 Nov 2023 15:28:46 +0100 Subject: [PATCH] [release/7.0] Fix libraries outerloop pipelines Backport of https://github.com/dotnet/runtime/pull/79652 to release/7.0 Fixes https://github.com/dotnet/runtime/issues/87287 --- eng/pipelines/libraries/outerloop.yml | 81 ++++++++++++--------------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml index 72c2de49363a2..e33726002766d 100644 --- a/eng/pipelines/libraries/outerloop.yml +++ b/eng/pipelines/libraries/outerloop.yml @@ -13,35 +13,10 @@ variables: jobs: - # - # CoreCLR Build - # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml - buildConfig: release - platforms: - - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: - - windows_x64 - - windows_x86 - - ${{ if eq(variables['includeLinuxOuterloop'], true) }}: - - Linux_x64 - - Linux_musl_x64 - - ${{ if eq(variables['isRollingBuild'], true) }}: - - Linux_arm - - Linux_arm64 - - Linux_musl_arm64 - - ${{ if eq(variables['includeOsxOuterloop'], true) }}: - - OSX_arm64 - - OSX_x64 - jobParameters: - testGroup: innerloop - # - # Libraries Build - # - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/libraries/build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml + helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml buildConfig: Release platforms: - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: @@ -58,18 +33,24 @@ jobs: - ${{ if and(eq(variables['includeOsxOuterloop'], true), eq(variables['isRollingBuild'], true)) }}: - OSX_arm64 - OSX_x64 - helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: - isOfficialBuild: ${{ variables['isOfficialBuild'] }} - includeAllPlatforms: ${{ variables['isRollingBuild'] }} - runTests: true testScope: outerloop - liveRuntimeBuildConfig: release - + nameSuffix: CoreCLR_Release + buildArgs: -s clr+host.native+libs+libs.tests -c $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true + timeoutInMinutes: 180 + includeAllPlatforms: ${{ variables['isRollingBuild'] }} + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/libraries/helix.yml + extraStepsParameters: + testScope: outerloop + creator: dotnet-bot + testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) + - ${{ if eq(variables['isRollingBuild'], false) }}: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/libraries/build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml + helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml buildConfig: Debug platforms: - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: @@ -80,27 +61,39 @@ jobs: - ${{ if eq(variables['includeOsxOuterloop'], true) }}: - OSX_arm64 - OSX_x64 - helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: - isOfficialBuild: ${{ variables['isOfficialBuild'] }} - includeAllPlatforms: ${{ variables['isRollingBuild'] }} - runTests: true testScope: outerloop - liveRuntimeBuildConfig: release + nameSuffix: CoreCLR_Release + buildArgs: -s clr+host.native+libs+libs.tests -c $(_BuildConfig) -rc Release -testscope outerloop /p:ArchiveTests=true + timeoutInMinutes: 180 + includeAllPlatforms: ${{ variables['isRollingBuild'] }} + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/libraries/helix.yml + extraStepsParameters: + testScope: outerloop + creator: dotnet-bot + testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/libraries/build-job.yml + jobTemplate: /eng/pipelines/common/global-build-job.yml + helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml buildConfig: Release platforms: - windows_x86 - ${{ if eq(variables['isRollingBuild'], true) }}: - windows_x64 - helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: - isOfficialBuild: ${{ variables['isOfficialBuild'] }} - includeAllPlatforms: ${{ variables['isRollingBuild'] }} framework: net48 - runTests: true testScope: outerloop + nameSuffix: NET48 + buildArgs: -s libs+libs.tests -c $(_BuildConfig) -testscope outerloop /p:ArchiveTests=true -f net48 + timeoutInMinutes: 180 + includeAllPlatforms: ${{ variables['isRollingBuild'] }} + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/libraries/helix.yml + extraStepsParameters: + testScope: outerloop + creator: dotnet-bot + extraHelixArguments: /p:BuildTargetFramework=net48 \ No newline at end of file