refactor: convert tests to fan out > fan in > fan out

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPDBTestsRun.ps1

@@ -45,8 +45,7 @@ function Invoke-CIPPDBTestsRun {
             return
         }
 
-        # Build batch of per-tenant list activities
-        # Each activity will start its own orchestrator for that tenant's tests
+        # Phase 1: Build per-tenant list activities (discover tests per tenant)
         $Batch = foreach ($Tenant in $AllTenantsList) {
             @{
                 FunctionName = 'CIPPTestsList'
@@ -56,14 +55,16 @@ function Invoke-CIPPDBTestsRun {
 
         Write-Information "Built batch of $($Batch.Count) tenant test list activities"
 
-        # Start orchestrator to dispatch per-tenant test orchestrators
+        # Phase 2 via PostExecution: Aggregate all task lists and start flat execution orchestrator
         $InputObject = [PSCustomObject]@{
             OrchestratorName = 'TestsList'
             Batch            = @($Batch)
             SkipLog          = $true
+            PostExecution    = @{
+                FunctionName = 'CIPPTestsApplyBatch'
+            }
         }
 
-        Write-Information "InputObject: $($InputObject | ConvertTo-Json -Depth 5 -Compress)"
         $InstanceId = Start-CIPPOrchestrator -InputObject $InputObject
         Write-Information "Started tests list orchestration with ID = '$InstanceId'"
 

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsApplyBatch.ps1

@@ -0,0 +1,57 @@
+function Push-CIPPTestsApplyBatch {
+    <#
+    .SYNOPSIS
+        Aggregate test tasks from all tenants and start a flat execution orchestrator (Phase 2)
+
+    .DESCRIPTION
+        PostExecution function for the Tests pipeline. Receives aggregated results from the
+        per-tenant CIPPTestsList activities, flattens them into a single batch, and starts
+        one orchestrator to execute all test tasks across all tenants in parallel.
+
+    .FUNCTIONALITY
+        Entrypoint
+    #>
+    param($Item)
+
+    try {
+        # Aggregate all test tasks from all tenant list activities
+        $AllTasks = [System.Collections.Generic.List[object]]::new()
+
+        foreach ($TenantResult in $Item.Results) {
+            foreach ($Batch in $TenantResult) {
+                foreach ($Task in $Batch) {
+                    if ($Task -and $Task.FunctionName) {
+                        $AllTasks.Add($Task)
+                    }
+                }
+            }
+        }
+
+        if ($AllTasks.Count -eq 0) {
+            Write-Information 'No test tasks to execute across all tenants'
+            return @{ Success = $true; TaskCount = 0 }
+        }
+
+        Write-Information "Aggregated $($AllTasks.Count) test tasks from all tenants"
+
+        # Start a single flat orchestrator to execute all test tasks
+        $InputObject = [PSCustomObject]@{
+            OrchestratorName = 'CIPPTestsExecute'
+            Batch            = @($AllTasks)
+            SkipLog          = $true
+        }
+
+        $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 10 -Compress)
+        Write-Information "Started flat tests execution orchestrator with ID = '$InstanceId' for $($AllTasks.Count) tasks"
+
+        return @{
+            Success    = $true
+            TaskCount  = $AllTasks.Count
+            InstanceId = $InstanceId
+        }
+
+    } catch {
+        Write-Warning "Error in Tests apply batch aggregation: $($_.Exception.Message)"
+        return @{ Success = $false; Error = $_.Exception.Message }
+    }
+}

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsList.ps1

@@ -1,7 +1,15 @@
 function Push-CIPPTestsList {
     <#
+    .SYNOPSIS
+        Build the list of test activities for a single tenant (Phase 1)
+
+    .DESCRIPTION
+        Checks whether the tenant has cached data and discovers all Invoke-CippTest* functions.
+        Returns the task array so the PostExecution aggregator can flatten all tenants into one
+        flat Phase 2 orchestrator.
+
     .FUNCTIONALITY
-    Entrypoint
+        Entrypoint
     #>
     param($Item)
 
@@ -27,41 +35,21 @@ function Push-CIPPTestsList {
             return @()
         }
 
-        # Build test batch for this tenant
-        $TestBatch = foreach ($Test in $AllTests) {
+        # Build test task list for this tenant — returned for PostExecution aggregation
+        $Tasks = foreach ($Test in $AllTests) {
             [PSCustomObject]@{
                 FunctionName = 'CIPPTest'
                 TenantFilter = $TenantFilter
                 TestId       = $Test
             }
         }
 
-        Write-Information "Built $($TestBatch.Count) test activities for tenant $TenantFilter"
-
-        # Start orchestrator for this tenant's tests
-        $InputObject = [PSCustomObject]@{
-            OrchestratorName = "TestsRun_$TenantFilter"
-            Batch            = @($TestBatch)
-            SkipLog          = $true
-        }
-
-        $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress)
-        Write-Information "Started tests orchestrator for tenant $TenantFilter with ID = '$InstanceId'"
-
-        return @{
-            Success    = $true
-            Tenant     = $TenantFilter
-            InstanceId = $InstanceId
-            TestCount  = $TestBatch.Count
-        }
+        Write-Information "Built $($Tasks.Count) test tasks for tenant $TenantFilter"
+        return @($Tasks)
 
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -API 'Tests' -tenant $TenantFilter -message "Failed to start tests for tenant: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
-        return @{
-            Success = $false
-            Tenant  = $TenantFilter
-            Error   = $ErrorMessage.NormalizedError
-        }
+        Write-LogMessage -API 'Tests' -tenant $TenantFilter -message "Failed to build test list: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
+        return @()
     }
 }