Stabilize CI Aspire tests

Author: Scott Arbeit

.github/workflows/validate.yml

@@ -36,5 +36,12 @@ jobs:
         run: dotnet workload install aspire
       - name: Docker info
         run: docker info
+      - name: Pre-pull Aspire images
+        run: |
+          docker pull redis:latest
+          docker pull mcr.microsoft.com/azure-storage/azurite:latest
+          docker pull mcr.microsoft.com/mssql/server:2022-latest
+          docker pull mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
+          docker pull mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest
       - name: Validate (Full)
         run: pwsh ./scripts/validate.ps1 -Full

scripts/validate.ps1

@@ -135,40 +135,6 @@ function Invoke-External([string]$Label, [scriptblock]$Command) {
     }
 }
 
-function Invoke-ParallelTests([array]$TestRuns, [string]$Configuration, [string]$RepoRoot) {
-    if (-not $TestRuns -or $TestRuns.Count -eq 0) {
-        return
-    }
-
-    $jobs = foreach ($testRun in $TestRuns) {
-        Start-Job -Name $testRun.Label -ArgumentList $testRun.Project, $Configuration, $RepoRoot, $testRun.Label -ScriptBlock {
-            param($project, $configuration, $repoRoot, $label)
-            Set-Location $repoRoot
-            dotnet test $project -c $configuration
-            $exitCode = $LASTEXITCODE
-            [pscustomobject]@{ Label = $label; ExitCode = $exitCode }
-        }
-    }
-
-    $results = @()
-    foreach ($job in $jobs) {
-        $jobOutput = Receive-Job -Job $job -Wait -AutoRemoveJob
-        foreach ($item in $jobOutput) {
-            if ($item -is [pscustomobject] -and $item.PSObject.Properties.Name -contains "ExitCode") {
-                $results += $item
-            } else {
-                Write-Host $item
-            }
-        }
-    }
-
-    $failed = $results | Where-Object { $_.ExitCode -ne 0 }
-    if ($failed) {
-        $failedLabels = ($failed | Select-Object -ExpandProperty Label) -join ", "
-        throw "Tests failed: $failedLabels."
-    }
-}
-
 try {
     if (-not $Fast -and -not $Full) {
         $Fast = $true
@@ -226,22 +192,10 @@ try {
 
     if (-not $SkipTests) {
         Write-Section "Test"
-        if ($Full) {
-            $repoRoot = (Get-Location).Path
-            $testRuns = @(
-                [pscustomobject]@{
-                    Label = "Grace.CLI.Tests"
-                    Project = "src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj"
-                },
-                [pscustomobject]@{
-                    Label = "Grace.Server.Tests"
-                    Project = "src/Grace.Server.Tests/Grace.Server.Tests.fsproj"
-                }
-            )
+        Invoke-External "Grace.CLI.Tests" { dotnet test "src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj" -c $Configuration }
 
-            Invoke-ParallelTests -TestRuns $testRuns -Configuration $Configuration -RepoRoot $repoRoot
-        } else {
-            Invoke-External "Grace.CLI.Tests" { dotnet test "src/Grace.CLI.Tests/Grace.CLI.Tests.fsproj" -c $Configuration }
+        if ($Full) {
+            Invoke-External "Grace.Server.Tests" { dotnet test "src/Grace.Server.Tests/Grace.Server.Tests.fsproj" -c $Configuration }
         }
     } else {
         Write-Section "Test"

src/Grace.Server.Tests/AspireTestHost.fs

@@ -37,7 +37,15 @@ module AspireTestHost =
 
     let private graceServerResourceName = "grace-server"
     let private serviceBusEmulatorResourceName = "servicebus-emulator"
-    let private defaultWaitTimeout = TimeSpan.FromMinutes(5.0)
+    let private isCi =
+        match Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), Environment.GetEnvironmentVariable("CI") with
+        | value, _ when not (String.IsNullOrWhiteSpace value) -> true
+        | _, value when not (String.IsNullOrWhiteSpace value) -> true
+        | _ -> false
+
+    let private getTimeout (local: TimeSpan) (ci: TimeSpan) = if isCi then ci else local
+
+    let private defaultWaitTimeout = getTimeout (TimeSpan.FromMinutes(5.0)) (TimeSpan.FromMinutes(10.0))
 
     let private getResource (app: DistributedApplication) (resourceName: string) =
         let model = app.Services.GetRequiredService<DistributedApplicationModel>()
@@ -294,7 +302,7 @@ module AspireTestHost =
     let private waitForServiceBusReadyAsync (state: TestHostState) =
         task {
             let sw = Stopwatch.StartNew()
-            let timeout = TimeSpan.FromSeconds(60.0)
+            let timeout = getTimeout (TimeSpan.FromSeconds(60.0)) (TimeSpan.FromMinutes(3.0))
             let mutable lastError = String.Empty
             let mutable ready = false
 
@@ -343,7 +351,7 @@ module AspireTestHost =
 
                 use client = new CosmosClient(connectionString, options)
                 let sw = Stopwatch.StartNew()
-                let timeout = TimeSpan.FromMinutes(3.0)
+                let timeout = getTimeout (TimeSpan.FromMinutes(3.0)) (TimeSpan.FromMinutes(6.0))
                 let perCallTimeout = TimeSpan.FromSeconds(10.0)
                 let mutable lastError = String.Empty
                 let mutable attempt = 0