ci(e2e): split with-API tests into parallel compute/dbaas jobs

Author: natalie-o-perret

.github/workflows/e2e.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
 
       - name: Build binary
         run: make build
@@ -25,24 +25,30 @@ jobs:
           go test -v
 
   test-e2e-with-api:
-    name: Run E2E (Testscript) Tests / With API
+    name: Run E2E (Testscript) Tests / With API / ${{ matrix.suite }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        suite: [compute, dbaas]
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
 
       - name: Build binary
         run: make build
 
-      - name: Run E2E (Testscript) Tests / With API
+      - name: Run E2E (Testscript) Tests / With API / ${{ matrix.suite }}
         env:
           EXOSCALE_API_KEY: ${{ secrets.EXOSCALE_API_KEY }}
           EXOSCALE_API_SECRET: ${{ secrets.EXOSCALE_API_SECRET }}
           EXOSCALE_ZONE: ch-gva-2
         run: |
           cd tests/e2e
-          go test -v -tags=api -timeout 30m -run TestScriptsAPI 2>&1
+          suite=${{ matrix.suite }}
+          func="TestScriptsAPI${suite^}"
+          go test -v -tags=api -timeout 30m -run "$func" 2>&1

tests/e2e/testscript_api_test.go

@@ -22,15 +22,28 @@ type APITestSuite struct {
 	RunID string
 }
 
-// TestScriptsAPI runs testscript scenarios that require real API access.
-// Run with: go test -v -tags=api -timeout 30m
+// TestScriptsAPICompute runs API e2e scenarios under scenarios/with-api/compute/.
+// Run with: go test -v -tags=api -timeout 30m -run TestScriptsAPICompute
+func TestScriptsAPICompute(t *testing.T) {
+	runAPITestSuite(t, "scenarios/with-api/compute")
+}
+
+// TestScriptsAPIDBaaS runs API e2e scenarios under scenarios/with-api/dbaas/.
+// Run with: go test -v -tags=api -timeout 30m -run TestScriptsAPIDBaaS
+func TestScriptsAPIDBaaS(t *testing.T) {
+	runAPITestSuite(t, "scenarios/with-api/dbaas")
+}
+
+// runAPITestSuite is the shared runner for per-suite API test functions.
+// dir is the directory of .txtar scenarios to run (relative to the e2e package).
 //
 // Required environment variables:
 //
 //	EXOSCALE_API_KEY    - Exoscale API key
 //	EXOSCALE_API_SECRET - Exoscale API secret
 //	EXOSCALE_ZONE       - Zone to run tests in (default: ch-gva-2)
-func TestScriptsAPI(t *testing.T) {
+func runAPITestSuite(t *testing.T, dir string) {
+	t.Helper()
 	if os.Getenv("EXOSCALE_API_KEY") == "" || os.Getenv("EXOSCALE_API_SECRET") == "" {
 		t.Skip("Skipping API tests: EXOSCALE_API_KEY and EXOSCALE_API_SECRET must be set")
 	}
@@ -48,13 +61,12 @@ func TestScriptsAPI(t *testing.T) {
 		RunID: runID,
 	}
 
-	// Run all scenarios under scenarios/with-api/
-	files, err := findTestScripts("scenarios/with-api")
+	files, err := findTestScripts(dir)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if len(files) == 0 {
-		t.Log("No API test scenarios found in scenarios/with-api/")
+		t.Logf("No API test scenarios found in %s/", dir)
 		return
 	}