Separate testing stage

dotnet · Jun 25, 2024 · ec19441 · ec19441
1 parent f9c76c5
commit ec19441
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 204 deletions.
diff --git a/diagnostics-codeql.yml b/diagnostics-codeql.yml
diff --git a/diagnostics.yml b/diagnostics.yml
@@ -41,32 +41,20 @@ extends:
   parameters:
     stages:
     - stage: build
-      displayName: Build and Test Diagnostics
+      displayName: Build Diagnostics Assets
       jobs:
 
-        ############################
-        #                          #
-        #    Source Build legs     #
-        #                          #
-        ############################
-
       - template: ${{ variables.sourceBuildTemplate }}
         parameters:
           platform:
             name: Complete
             buildScript: ./eng/common/build.sh
 
-      ############################
-      #                          #
-      #        Build legs        #
-      #                          #
-      ############################
-
       - template: /eng/pipelines/build.yml
         parameters:
           jobTemplate: ${{ variables.jobTemplate }}
-          name: Windows
-          osGroup: Windows_NT
+          osGroup: Windows
+          buildOnly: true
           buildConfigs:
           - configuration: Debug
             architecture: x64
@@ -123,6 +111,7 @@ extends:
         parameters:
           jobTemplate: ${{ variables.jobTemplate }}
           osGroup: MacOS
+          buildOnly: true
           buildConfigs:
           - configuration: Release
             architecture: x64
@@ -200,19 +189,46 @@ extends:
               artifactUploadPath: bin/linux.arm64.Release
               artifactTargetPath: bin/linux-musl.arm64.Release
 
-      ############################
-      #                          #
-      #      Test only legs      #
-      #                          #
-      ############################
+    - stage: test
+      displayName: Run Diagnostics Tests
+      jobs:
+
+      - template: /eng/pipelines/build.yml
+        parameters:
+          jobTemplate: ${{ variables.jobTemplate }}
+          osGroup: Windows
+          testOnly: true
+          buildConfigs:
+          - configuration: Debug
+            architecture: x64
+          - configuration: Release
+            architecture: x64
+          - configuration: Release
+            architecture: x86
+          - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+            - configuration: Release
+              architecture: arm
+            - configuration: Release
+              architecture: arm64
+
+      - template: /eng/pipelines/build.yml
+        parameters:
+          jobTemplate: ${{ variables.jobTemplate }}
+          osGroup: MacOS
+          testOnly: true
+          buildConfigs:
+          - configuration: Release
+            architecture: x64
+          - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+            - configuration: Debug
+              architecture: x64
 
       - template: /eng/pipelines/build.yml
         parameters:
           jobTemplate: ${{ variables.jobTemplate }}
           name: Ubuntu_20_04
           osGroup: Linux
           container: test_ubuntu_20_04
-          dependsOn: Linux
           testOnly: true
           buildConfigs:
           - configuration: Release
@@ -227,7 +243,6 @@ extends:
           name: Ubuntu_22_04
           osGroup: Linux
           container: test_ubuntu_22_04
-          dependsOn: Linux
           testOnly: true
           buildConfigs:
           - configuration: Release
@@ -243,7 +258,6 @@ extends:
           osGroup: Linux
           osSuffix: -musl
           container: test_linux_musl_x64
-          dependsOn: Linux_musl
           testOnly: true
           disableComponentGovernance: true
           buildConfigs:
@@ -261,7 +275,6 @@ extends:
             osGroup: Linux
             container: test_debian_11_amd64
             dependsOn: Linux
-            testOnly: true
             buildConfigs:
             - configuration: Release
               architecture: x64
@@ -275,7 +288,6 @@ extends:
             name: Fedora_39
             osGroup: Linux
             container: test_fedora
-            dependsOn: Linux
             testOnly: true
             buildConfigs:
             - configuration: Release
@@ -287,6 +299,7 @@ extends:
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - stage: package
         displayName: Package, Sign, and Generate BAR Manifests
+        dependsOn: build
         jobs:
         - template: /eng/common/templates-official/job/job.yml
           parameters:
@@ -366,6 +379,7 @@ extends:
           enableNugetValidation: true
           symbolPublishingAdditionalParameters: '/p:PublishSpecialClrFiles=false'
           publishInstallersAndChecksums: true
+          publishAssetsImmediately: true
 
       # This sets up the bits to do a Release.
       - template: /eng/pipelines/prepare-release.yml