Merge commit 'fae2a56cd032d9b68c58fd4dc960160b7013842a' into masterMerge

1 files changed, 24 insertions, 112 deletions

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0fdb01573f..1bfe4c510e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -96,7 +96,7 @@ jobs:
 # https://github.com/Microsoft/azure-pipelines-yaml/pull/46 for more information
 
 #
-# Debug build (Pull Request)
+# Debug build (Pull request)
 #
 - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'coreclr-ci')) }}:
   - template: eng/platform-matrix.yml
@@ -114,7 +114,7 @@ jobs:
       buildConfig: checked
 
 #
-# Release build (Pull Request)
+# Release build (Pull request)
 #
 - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'coreclr-ci')) }}:
   - template: eng/platform-matrix.yml
@@ -123,7 +123,7 @@ jobs:
       buildConfig: release
 
 #
-# Release build (Official Build)
+# Release build (Official build)
 #
 - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng/platform-matrix.yml
@@ -140,151 +140,66 @@ jobs:
 # Checked test builds
 #
 
-# Pri0 (Pull Request)
-- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'coreclr-ci')) }}:
-  - template: eng/platform-matrix.yml
-    parameters:
-      jobTemplate: test-job.yml
-      buildConfig: checked
-      jobParameters:
-        priority: 0
-        scenarios:
-          asString: 'normal,no_tiered_compilation'
-          asArray:
-          - normal
-          - no_tiered_compilation
-        # "Total" includes building tests, waiting for a queue in Helix to become available, and running the tests.
-        # In case test-job.yml gets split into two separate jobs (e.g. build-test-job.yml and run-test.yml)
-        # this number should be adjusted accordingly.
-        timeoutTotalInMinutes: 240
-        # "PerCollection" is time needed for the "biggest" xUnit test collection to complete.
-        # In case xUnit test wrappers get refactored this number should also be adjusted.
-        timeoutPerTestCollectionInMinutes: 30
-        # "PerTest" corresponds to individual test running time (i.e. __TestTimeout).
-        timeoutPerTestInMinutes: 10
-
-# Pri1 (Pull Request, Outerloop)
-- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'coreclr-outerloop')) }}:
+# Pull request
+- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng/platform-matrix.yml
     parameters:
       jobTemplate: test-job.yml
       buildConfig: checked
       jobParameters:
-        priority: 1
-        scenarios:
-          asString: 'normal,no_tiered_compilation'
-          asArray:
-          - normal
-          - no_tiered_compilation
-        timeoutTotalInMinutes: 360
-        timeoutPerTestCollectionInMinutes: 60
-        timeoutPerTestInMinutes: 10
-
-# Pri1 (CI)
+        ${{ if eq(variables['Build.DefinitionName'], 'coreclr-ci') }}:
+          testGroup: innerloop
+        ${{ if eq(variables['Build.DefinitionName'], 'coreclr-outerloop') }}:
+          testGroup: outerloop
+        ${{ if eq(variables['Build.DefinitionName'], 'coreclr-outerloop-jitminopts-jitstress1-jitstress2') }}:
+          testGroup: outerloop-jitminopts-jitstress1-jitstress2
+
+# CI
 - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) }}:
   - template: eng/platform-matrix.yml
     parameters:
       jobTemplate: test-job.yml
       buildConfig: checked
       jobParameters:
-        priority: 1
-        scenarios:
-          asString: 'normal,no_tiered_compilation'
-          asArray:
-          - normal
-          - no_tiered_compilation
-        timeoutTotalInMinutes: 360
-        timeoutPerTestCollectionInMinutes: 60
-        timeoutPerTestInMinutes: 10
-
-# Pri1 ReadyToRun (CI)
-- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) }}:
+        testGroup: outerloop
+
   - template: eng/platform-matrix.yml
     parameters:
       jobTemplate: test-job.yml
       buildConfig: checked
       jobParameters:
-        priority: 1
         readyToRun: true
-        scenarios:
-          asString: 'normal,no_tiered_compilation'
-          asArray:
-          - normal
-          - no_tiered_compilation
-        timeoutTotalInMinutes: 360
-        timeoutPerTestCollectionInMinutes: 60
-        timeoutPerTestInMinutes: 10
-
-# Pri1 (Schedule, Manual)
+        testGroup: outerloop
+
+# Schedule or Manual
 - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule', 'Manual')) }}:
   - template: eng/platform-matrix.yml
     parameters:
       jobTemplate: test-job.yml
       buildConfig: checked
       jobParameters:
-        priority: 1
-        scenarios:
-          asString: 'normal,no_tiered_compilation,jitstress1,jitstress2,jitstress1_tiered,jitstress2_tiered,jitstressregs1,jitstressregs2,jitstressregs3,jitstressregs4,jitstressregs8,jitstressregs0x10,jitstressregs0x80,jitstressregs0x1000,jitminopts'
-          asArray:
-          - normal
-          - no_tiered_compilation
-          - jitstress1
-          - jitstress2
-          - jitstress1_tiered
-          - jitstress2_tiered
-          - jitstressregs1
-          - jitstressregs2
-          - jitstressregs3
-          - jitstressregs4
-          - jitstressregs8
-          - jitstressregs0x10
-          - jitstressregs0x80
-          - jitstressregs0x1000
-          - jitminopts
-        timeoutTotalInMinutes: 480
-        # TODO: Adjust this number as soon as we have more data on how long it takes to run these jobs in Helix.
-        timeoutPerTestCollectionInMinutes: 120
-        timeoutPerTestInMinutes: 30
-
+        testGroup: outerloop
 
 #
 # Release test builds
 #
 
-# Pri1 (Official Build)
+# Official build
 - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng/platform-matrix.yml
     parameters:
       jobTemplate: test-job.yml
       buildConfig: release
       jobParameters:
-        priority: 1
-        scenarios:
-          asString: 'normal,no_tiered_compilation'
-          asArray:
-          - normal
-          - no_tiered_compilation
-        timeoutTotalInMinutes: 360
-        timeoutPerTestCollectionInMinutes: 60
-        timeoutPerTestInMinutes: 10
-
-# Pri1 ReadyToRun (Official Build)
-- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+        testGroup: outerloop
+
   - template: eng/platform-matrix.yml
     parameters:
       jobTemplate: test-job.yml
       buildConfig: release
       jobParameters:
-        priority: 1
+        testGroup: outerloop
         readyToRun: true
-        scenarios:
-          asString: 'normal,no_tiered_compilation'
-          asArray:
-          - normal
-          - no_tiered_compilation
-        timeoutTotalInMinutes: 360
-        timeoutPerTestCollectionInMinutes: 60
-        timeoutPerTestInMinutes: 10
 
 
 # Publish build information to Build Assets Registry
@@ -295,11 +210,8 @@ jobs:
 # official builds if we add more platform/arch combinations.
 
 - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-  - template: /eng/common/templates/job/publish-build-assets.yml
+  - template: /eng/finalize-publish.yml
     parameters:
-      configuration: Release
-      pool:
-        name: dotnet-internal-temp
       dependsOn:
       - build_Linux_arm_release
       - build_Linux_arm64_release