WIP

Author: Maed223

.github/actions/test-provider-tfe/action.yml

@@ -51,6 +51,9 @@ inputs:
     description: The mock run tasks URL to use for testing.
     required: false
     default: "http://testing-mocks.tfe:22180/runtasks/pass"
+  test_name:
+    description: Name of the test run
+    required: true
 
 runs:
   using: composite
@@ -87,8 +90,20 @@ runs:
         index: ${{ inputs.matrix_index }}
         total: ${{ inputs.matrix_total }}
         junit-summary: ./ci-summary-provider.xml
-        # When tests are split and run concurrently, lists_tests arg in ci.yml will skip the TestAccTFESAMLSettings_omnibus test suite
         list: ${{ inputs.list_tests }}
+      continue-on-error: true
+
+    - name: Fallback test selection
+      id: test_fallback
+      shell: bash
+      run: |
+        if [ "${{ steps.test_split.outcome }}" = "failure" ] || [ -z "${{ steps.test_split.outputs.run }}" ]; then
+          echo "Junit splitting failed or no output, using regex fallback"
+          echo "run=${{ inputs.list_tests }}" >> $GITHUB_OUTPUT
+        else
+          echo "Using junit split output"
+          echo "run=${{ steps.test_split.outputs.run }}" >> $GITHUB_OUTPUT
+        fi
 
     - name: Run Tests
       shell: bash
@@ -116,11 +131,11 @@ runs:
         MOD_TFE: github.com/hashicorp/terraform-provider-tfe/internal/provider
         MOD_VERSION: github.com/hashicorp/terraform-provider-tfe/version
       run: |
-        gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=60m -run "${{ steps.test_split.outputs.run }}"
+        gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=60m -run "${{ steps.test_fallback.outputs.run }}"
 
     - name: Upload test artifacts
       uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       with:
-        name: junit-test-summary-${{ matrix.index }}
+        name: junit-${{ inputs.test_name }}-summary-${{ matrix.index }}
         path: summary.xml
         retention-days: 1

.github/workflows/ci.yml

@@ -16,25 +16,48 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/lint-provider-tfe
 
-  tests:
-    name: run
+    tests:
+    name: ${{ matrix.test_suite }}
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    needs: setup
+    timeout-minutes: 40
     strategy:
       fail-fast: false
       matrix:
-        # If you adjust these parameters, also adjust the jrm input files on the "Merge reports" step below
-        total: [ 1 ]
-        index: [ 0 ]
+        include:
+          # Standard tests with 5-runner matrix
+          - test_suite: "Standard Tests"
+            test_name: "tests"
+            list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*_RunDependent)]"
+            total: 5
+            index: 0
+          - test_suite: "Standard Tests"
+            test_name: "tests"
+            list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*_RunDependent)]"
+            total: 5
+            index: 1
+          - test_suite: "Standard Tests"
+            test_name: "tests"
+            list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*_RunDependent)]"
+            total: 5
+            index: 2
+          - test_suite: "Standard Tests"
+            test_name: "tests"
+            list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*_RunDependent)]"
+            total: 5
+            index: 3
+          - test_suite: "Standard Tests"
+            test_name: "tests"
+            list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*_RunDependent)]"
+            total: 5
+            index: 4
+          # Dependent tests with 1-runner matrix
+          - test_suite: "Dependent Tests"
+            test_name: "run-dependent-tests"
+            list_tests: "TestAcc.*_RunDependent"
+            total: 1
+            index: 0
     steps:
-      - name: Fetch Outputs
-        id: tflocal
-        uses: hashicorp-forge/terraform-cloud-action/outputs@5583d5f554d268ac91b3c37fd0a5e9da2c78c017 # v1.1.0
-        with:
-          token: "${{ secrets.TF_WORKFLOW_TFLOCAL_CLOUD_TFC_TOKEN }}"
-          organization: hashicorp-v2
-          workspace: tflocal-terraform-provider-tfe
-
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - uses: ./.github/actions/test-provider-tfe

internal/provider/resource_tfe_workspace_run_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
 
-func TestAccTFEWorkspaceRun_withApplyOnlyBlock(t *testing.T) {
+func TestAccTFEWorkspaceRun_withApplyOnlyBlock_RunDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -65,7 +65,7 @@ func TestAccTFEWorkspaceRun_withApplyOnlyBlock(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks(t *testing.T) {
+func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks_RunDependent(t *testing.T) {
 	skipUnlessBeta(t)
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
@@ -115,7 +115,7 @@ func TestAccTFEWorkspaceRun_withBothApplyAndDestroyBlocks(t *testing.T) {
 	})
 }
 
-func TestAccTFEWorkspaceRun_invalidParams(t *testing.T) {
+func TestAccTFEWorkspaceRun_invalidParams_RunDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	tfeClient, err := getClientUsingEnv()
@@ -156,7 +156,7 @@ func TestAccTFEWorkspaceRun_invalidParams(t *testing.T) {
 	}
 }
 
-func TestAccTFEWorkspaceRun_WhenRunErrors(t *testing.T) {
+func TestAccTFEWorkspaceRun_WhenRunErrors_RunDependent(t *testing.T) {
 	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
 
 	tfeClient, err := getClientUsingEnv()