Add test splitting infrastructure with auto-detection support and GitHub Actions integration

.github/actions/enumerate-tests/action.yml

@@ -1,10 +1,6 @@
 name: 'Enumerate test projects'
 description: 'Enumerate list of test projects'
 inputs:
-  includeIntegrations:
-    required: false
-    type: boolean
-    default: false
   includeTemplates:
     required: false
     type: boolean
@@ -14,16 +10,26 @@ inputs:
     type: boolean
     default: false
 
+# Output format: JSON with structure {"include": [{...}, ...]}
+# Each entry contains:
+#   - type: 'regular' | 'collection' | 'class'
+#   - projectName: Full project name (e.g., 'Aspire.Hosting.Tests')
+#   - name: Display name for the test run
+#   - shortname: Short identifier
+#   - testProjectPath: Relative path to the test project
+#   - workitemprefix: Prefix for work item naming
+#   - runs-on: GitHub Actions runner (e.g., 'ubuntu-latest', 'windows-latest')
+#   - testSessionTimeout: Timeout for the test session (e.g., '20m')
+#   - testHangTimeout: Timeout for hung tests (e.g., '10m')
+#   - requiresNugets: Boolean indicating if NuGet packages are needed
+#   - requiresTestSdk: Boolean indicating if test SDK is needed
+#   - extraTestArgs: Additional test arguments (e.g., '--filter-trait "Partition=P1"')
+#   - collection: (collection type only) Collection/partition name
+#   - classname: (class type only) Fully qualified test class name
 outputs:
-  integrations_tests_matrix:
-    description: Integration tests matrix
-    value: ${{ steps.generate_integrations_matrix.outputs.integrations_tests_matrix }}
-  templates_tests_matrix:
-    description: Templates tests matrix
-    value: ${{ steps.generate_templates_matrix.outputs.templates_tests_matrix }}
-  cli_e2e_tests_matrix:
-    description: Cli E2E tests matrix
-    value: ${{ steps.generate_cli_e2e_matrix.outputs.cli_e2e_tests_matrix }}
+  tests_matrix:
+    description: Canonical tests matrix for all tests
+    value: ${{ steps.generate_canonical_matrix.outputs.tests_matrix }}
 runs:
   using: "composite"
   steps:
@@ -35,92 +41,36 @@ runs:
       with:
         global-json-file: ${{ github.workspace }}/global.json
 
-    - name: Get list of integration tests
-      if: ${{ inputs.includeIntegrations }}
-      shell: pwsh
-      run: >
-        dotnet build ${{ github.workspace }}/tests/Shared/GetTestProjects.proj
-        /bl:${{ github.workspace }}/artifacts/log/Debug/GetTestProjects.binlog
-        /p:TestsListOutputPath=${{ github.workspace }}/artifacts/TestsForGithubActions.list
-        /p:ContinuousIntegrationBuild=true
+    - name: Restore
+      shell: bash
+      run: ./restore.sh
 
-    - name: Generate list of template tests
-      if: ${{ inputs.includeTemplates }}
-      shell: pwsh
+    - name: Generate canonical test matrix
+      shell: bash
       run: >
-          dotnet build ${{ github.workspace }}/tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj
-          "/t:Build;ExtractTestClassNames"
-          /bl:${{ github.workspace }}/artifacts/log/Debug/BuildTemplatesTests.binlog
-          -p:ExtractTestClassNamesForHelix=true
-          -p:PrepareForHelix=true
-          -p:ExtractTestClassNamesPrefix=Aspire.Templates.Tests
-          -p:InstallBrowsersForPlaywright=false
+        ./build.sh -test
+        /p:TestRunnerName=TestEnumerationRunsheetBuilder
+        /p:TestMatrixOutputPath=artifacts/canonical-test-matrix.json
+        /p:IncludeTemplateTests=${{ inputs.includeTemplates }}
+        /p:IncludeCliE2ETests=${{ inputs.includeCliE2E }}
+        /p:GenerateCIPartitions=true
+        /bl
 
-    - name: Generate list of CLI E2E tests
-      if: ${{ inputs.includeCliE2E }}
-      shell: pwsh
-      run: >
-          dotnet build ${{ github.workspace }}/tests/Aspire.Cli.EndToEnd.Tests/Aspire.Cli.EndToEnd.Tests.csproj
-          "/t:Build;ExtractTestClassNames"
-          /bl:${{ github.workspace }}/artifacts/log/Debug/BuildCliEndToEndTests.binlog
-          -p:ExtractTestClassNamesForHelix=true
-          -p:PrepareForHelix=true
-          -p:ExtractTestClassNamesPrefix=Aspire.Cli.EndToEnd.Tests
-          -p:InstallBrowsersForPlaywright=false
-
-    - name: Generate tests matrix
-      id: generate_integrations_matrix
-      if: ${{ inputs.includeIntegrations }}
+    - name: Expand matrix for GitHub Actions
+      id: generate_canonical_matrix
       shell: pwsh
       run: |
-        $filePath = "${{ github.workspace }}/artifacts/TestsForGithubActions.list"
-        $lines = Get-Content $filePath
-        $jsonObject = @{
-            "shortname" = $lines | Sort-Object
-        }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "integrations_tests_matrix=$jsonString"
-        "integrations_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
-
-    - name: Generate templates matrix
-      id: generate_templates_matrix
-      if: ${{ inputs.includeTemplates }}
-      shell: pwsh
-      run: |
-        $inputFilePath = "${{ github.workspace }}/artifacts/helix/templates-tests/Aspire.Templates.Tests.tests.list"
-        $lines = Get-Content $inputFilePath
-
-        $prefix = "Aspire.Templates.Tests."
-        $lines = Get-Content $inputFilePath | ForEach-Object {
-            $_ -replace "^$prefix", ""
-        }
-
-        $jsonObject = @{
-            "shortname" = $lines | Sort-Object
-        }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "templates_tests_matrix=$jsonString"
-        "templates_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
-
-    - name: Generate cli e2e matrix
-      id: generate_cli_e2e_matrix
-      if: ${{ inputs.includeCliE2E }}
-      shell: pwsh
-      run: |
-        $inputFilePath = "${{ github.workspace }}/artifacts/helix/cli-e2e-tests/Aspire.Cli.EndToEnd.Tests.tests.list"
-        $lines = Get-Content $inputFilePath
-
-        $prefix = "Aspire.Cli.EndToEnd.Tests."
-        $lines = @(Get-Content $inputFilePath | ForEach-Object {
-            $_ -replace "^$prefix", ""
-        })
+        $canonicalMatrixPath = "${{ github.workspace }}/artifacts/canonical-test-matrix.json"
+        $expandScript = "${{ github.workspace }}/eng/scripts/expand-test-matrix-github.ps1"
 
-        $jsonObject = @{
-            "shortname" = @($lines | Sort-Object)
+        if (Test-Path $canonicalMatrixPath) {
+          & $expandScript -CanonicalMatrixFile $canonicalMatrixPath -OutputToGitHubEnv
+        } else {
+          # Empty matrix if no canonical matrix found
+          $emptyMatrix = '{"include":[]}'
+          "tests_matrix=$emptyMatrix" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
+          Write-Host "No canonical test matrix found, using empty matrix"
         }
-        $jsonString = ConvertTo-Json $jsonObject -Compress
-        "cli_e2e_tests_matrix=$jsonString"
-        "cli_e2e_tests_matrix=$jsonString" | Out-File -FilePath $env:GITHUB_OUTPUT
 
     - name: Upload logs
       if: always()
@@ -129,4 +79,6 @@ runs:
         name: logs-enumerate-tests-${{ runner.os }}
         path: |
           artifacts/log/**/*.binlog
-          artifacts/**/*.list
+          artifacts/**/*tests-partitions.json
+          artifacts/**/*tests-metadata.json
+          artifacts/canonical-test-matrix.json

.github/workflows/run-tests.yml

@@ -224,7 +224,8 @@ jobs:
         run: >
           ${{ env.BUILD_SCRIPT }} -restore -ci -build -projects ${{ env.TEST_PROJECT_PATH }}
           /p:PrepareForHelix=true
-          /bl:${{ github.workspace }}/artifacts/log/Debug/PrepareForHelix.binlog
+          /p:ArchiveTests=true
+          /bl:${{ github.workspace }}/artifacts/log/Debug/BuildAndArchive.binlog
           ${{ !inputs.enablePlaywrightInstall && '/p:InstallBrowsersForPlaywright=false' || '' }}
           ${{ inputs.versionOverrideArg }}
 
@@ -286,6 +287,12 @@ jobs:
           TEST_LOG_PATH: ${{ github.workspace }}/artifacts/log/test-logs
           TestsRunningOutsideOfRepo: true
           TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: 'netaspireci.azurecr.io'
+          # PR number for CLI E2E tests that download artifacts from a PR
+          GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
+          # PR head SHA for version verification (not the merge commit SHA)
+          GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          # GitHub token for CLI E2E tests to download artifacts
+          GH_TOKEN: ${{ github.token }}
         run: |
           # Start heartbeat monitor in background
           ${{ github.workspace }}/${{ env.DOTNET_SCRIPT }} ${{ github.workspace }}/tools/scripts/Heartbeat.cs &
@@ -324,6 +331,12 @@ jobs:
           TEST_LOG_PATH: ${{ github.workspace }}/artifacts/log/test-logs
           TestsRunningOutsideOfRepo: true
           TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: 'netaspireci.azurecr.io'
+          # PR number for CLI E2E tests that download artifacts from a PR
+          GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
+          # PR head SHA for version verification (not the merge commit SHA)
+          GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          # GitHub token for CLI E2E tests to download artifacts
+          GH_TOKEN: ${{ github.token }}
         run: |
           # Start heartbeat monitor in background (output goes to console directly)
           $heartbeatProcess = Start-Process -FilePath "dotnet" `