From 0a66057d1e6e5b3ed8ed6b99f59fc81f8e1be337 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 14 Dec 2022 16:32:20 +0100
Subject: [PATCH] Fix libraries outerloop pipelines

Fixes https://github.com/dotnet/runtime/issues/76755
---
 eng/pipelines/libraries/outerloop.yml | 80 ++++++++++++---------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml
index 7c4c78fbe4fd8..81d0c680f6f61 100644
--- a/eng/pipelines/libraries/outerloop.yml
+++ b/eng/pipelines/libraries/outerloop.yml
@@ -18,35 +18,10 @@ extends:
     - stage: Build
       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) }}:
@@ -63,18 +38,24 @@ extends:
             - ${{ 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: AllSubsets_CoreCLR
+              buildArgs: -s clr+host.native+libs+libs.tests -lc $(_BuildConfig) -hc $(_BuildConfig) -rc Release -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
+                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) }}:
@@ -85,27 +66,38 @@ extends:
               - ${{ 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: AllSubsets_CoreCLR
+                buildArgs: -s clr+host.native+libs+libs.tests -lc $(_BuildConfig) -hc $(_BuildConfig) -rc Release -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
+                  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: AllSubsets_CoreCLR
+                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
+                  testRunNamePrefixSuffix: NET48_$(_BuildConfig)