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
@@ -76,7 +79,7 @@ runs:
       uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
       with:
         workflow_conclusion: success
-        name: junit-test-summary
+        name: junit-${{ inputs.test_name }}-summary
         if_no_artifact_found: warn
         branch: main
 
@@ -121,6 +124,6 @@ runs:
     - 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

@@ -56,19 +56,18 @@ jobs:
           # which runs against all tests using the list arg
           # lists_tests regex is used to skip the TestAccTFESAMLSettings_omnibus test suite and any test matching TestAcc*_RunDependent for CI tests only
           list_tests: "[^(TestAccTFESAMLSettings_omnibus|TestAcc.*_RunDependent)]"
+          test_name: "tests"
 
   run-dependent-tests:
-    name: run-dependent-tests
-    needs:
-      - tests
+    name: run
     runs-on: ubuntu-latest
     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: [ 6 ]
-        index: [ 5 ]
+        total: [ 1 ]
+        index: [ 0 ]
     steps:
       - name: Fetch Outputs
         id: tflocal
@@ -97,14 +96,13 @@ jobs:
           # Run terminal cmd 'go help testflag' to learn more about -list flag
           # action.yml uses https://github.com/hashicorp-forge/go-test-split-action/blob/main/action.yml to split acceptance tests
           # which runs against all tests using the list arg
-          # lists_tests regex is used to include the TestAccTFESAMLSettings_omnibus test suite and skip any test matching TestAcc*_RunDependent for CI tests only
-          list_tests: "^(?!(?:TestAccTFESAMLSettings_omnibus$|TestAcc.*_RunDependent$)).*"
+          # lists_tests regex is used to include the any test matching TestAcc*_RunDependent for CI tests only
+          list_tests: "TestAcc.*_RunDependent"
+          test_name: "run-dependent-tests"
 
   tests-combine-summaries:
     name: Combine Test Reports
-    needs:
-      - tests
-      - run-dependent-tests
+    needs: [ tests, run-dependent-tests ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -118,7 +116,7 @@ jobs:
         run: npm install -g junit-report-merger
 
       - name: Merge reports
-        run: jrm ./ci-summary-provider.xml "junit-test-summary-0/*.xml" "junit-test-summary-1/*.xml" "junit-test-summary-2/*.xml" "junit-test-summary-3/*.xml" "junit-test-summary-4/*.xml" "junit-test-summary-5/*.xml"
+        run: jrm ./ci-summary-provider.xml "junit-tests-summary-0/*.xml" "junit-tests-summary-1/*.xml" "junit-tests-summary-2/*.xml" "junit-tests-summary-3/*.xml" "junit-tests-summary-4/*.xml" "junit-tests-summary/*.xml" "junit-run-dependent-tests-summary-0/*.xml" 
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -128,9 +126,7 @@ jobs:
 
   tests-summarize:
     name: Summarize Tests
-    needs:
-      - tests
-      - run-dependent-tests
+    needs: [ tests ]
     runs-on: ubuntu-latest
     if: ${{ always() }}
     steps: