WIP

Author: Maed223

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

@@ -37,7 +37,7 @@ inputs:
   token:
     description: HCP Terraform or Terraform Enterprise token
     required: true
-  testing-github-token:
+  testing_github_token:
     description: The GitHub token used for testing scenarios
     required: false
   enterprise:
@@ -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 identifier for the test suite being run
+    required: true
 
 runs:
   using: composite
@@ -82,18 +85,31 @@ runs:
 
     - name: Split acceptance tests
       id: test_split
+      if: inputs.test_name == 'tests'
       uses: hashicorp-forge/go-test-split-action@796beedbdb3d1bea14cad2d3057bab5c5cf15fe5 # v1.0.2
       with:
         index: ${{ inputs.matrix_index }}
         total: ${{ inputs.matrix_total }}
         junit-summary: ./ci-summary-provider.xml
         list: ${{ inputs.list_tests }}
 
+    - 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
       env:
-        TFE_HOSTNAME: "${{ inputs.hostname }}"
-        TFE_TOKEN: "${{ inputs.token }}"
+        TFE_HOSTNAME: ${{ inputs.hostname }}
+        TFE_TOKEN: ${{ inputs.token }}
         TFE_ADMIN_CONFIGURATION_TOKEN: ${{ inputs.admin_configuration_token }}
         TFE_ADMIN_PROVISION_LICENSES_TOKEN: ${{ inputs.admin_provision_licenses_token }}
         TFE_ADMIN_SECURITY_MAINTENANCE_TOKEN: ${{ inputs.admin_security_maintenance_token }}
@@ -104,22 +120,27 @@ runs:
         TFE_USER1: tfe-provider-user1
         TFE_USER2: tfe-provider-user2
         TF_ACC: "1"
-        ENABLE_TFE: "${{ inputs.enterprise }}"
-        RUN_TASKS_URL: "${{ inputs.run_tasks_url }}"
+        ENABLE_TFE: ${{ inputs.enterprise }}
+        RUN_TASKS_URL: ${{ inputs.run_tasks_url }}
         GITHUB_POLICY_SET_IDENTIFIER: "hashicorp/test-policy-set"
         GITHUB_REGISTRY_MODULE_IDENTIFIER: "hashicorp/terraform-random-module"
         GITHUB_WORKSPACE_IDENTIFIER: "hashicorp/terraform-random-module"
         GITHUB_WORKSPACE_BRANCH: "main"
-        GITHUB_TOKEN: "${{ inputs.testing-github-token }}"
+        GITHUB_TOKEN: ${{ inputs.testing_github_token }}
         MOD_PROVIDER: github.com/hashicorp/terraform-provider-tfe
         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 }}"
+        if [ "${{ inputs.test_name }}" = "tests" ] && [ -n "${{ steps.test_split.outputs.run }}" ]; then
+          TEST_PATTERN="${{ steps.test_split.outputs.run }}"
+        else
+          TEST_PATTERN="${{ inputs.list_tests }}"
+        fi
+        gotestsum --junitfile summary.xml --format short-verbose -- $MOD_PROVIDER $MOD_TFE $MOD_VERSION -v -timeout=60m -run "$TEST_PATTERN"
 
     - 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-${{ inputs.matrix_index }}
         path: summary.xml
         retention-days: 1

.github/workflows/ci.yml

@@ -62,27 +62,33 @@ jobs:
         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
@@ -95,7 +101,7 @@ jobs:
           matrix_total: ${{ matrix.total }}
           hostname: ${{ needs.setup.outputs.hostname }}
           token: ${{ needs.setup.outputs.token }}
-          testing-github-token: ${{ secrets.TESTING_GITHUB_TOKEN }}
+          testing_github_token: ${{ secrets.TESTING_GITHUB_TOKEN }}
           admin_configuration_token: ${{ needs.setup.outputs.admin_configuration_token }}
           admin_provision_licenses_token: ${{ needs.setup.outputs.admin_provision_licenses_token }}
           admin_security_maintenance_token: ${{ needs.setup.outputs.admin_security_maintenance_token }}
@@ -104,6 +110,7 @@ jobs:
           admin_support_token: ${{ needs.setup.outputs.admin_support_token }}
           admin_version_maintenance_token: ${{ needs.setup.outputs.admin_version_maintenance_token }}
           list_tests: ${{ matrix.list_tests }}
+          test_name: ${{ matrix.test_name }}
 
   tests-combine-summaries:
     name: Combine Test Reports