From 027f61440ba7e5078802836c5c129d985fb33323 Mon Sep 17 00:00:00 2001
From: Brandon Croft <brandon.croft@gmail.com>
Date: Thu, 23 May 2024 14:17:44 -0600
Subject: [PATCH] Revert "disable parallelism from our tests (#885)"

This reverts commit 50939d749affcc2df4c876f062f5247c26d3e62b.
---
 .github/actions/test-go-tfe/action.yml | 2 +-
 .github/workflows/ci.yml               | 6 +++---
 .github/workflows/nightly-tfe-ci.yml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/actions/test-go-tfe/action.yml b/.github/actions/test-go-tfe/action.yml
index 54e9f9a12..25eed8c49 100644
--- a/.github/actions/test-go-tfe/action.yml
+++ b/.github/actions/test-go-tfe/action.yml
@@ -99,7 +99,7 @@ runs:
         GO111MODULE: "on"
         ENABLE_TFE: ${{ inputs.enterprise }}
       run: |
-        gotestsum --junitfile summary.xml --format short-verbose -- -parallel=1 -timeout=29m -run "${{ steps.test_split.outputs.run }}"
+        gotestsum --junitfile summary.xml --format short-verbose -- -timeout=29m -run "${{ steps.test_split.outputs.run }}"
 
     - name: Upload test artifacts
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83c483f8a..96312490c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,8 +26,8 @@ jobs:
       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 ]
+        total: [ 4 ]
+        index: [ 0, 1, 2, 3 ]
 
     timeout-minutes: 30
     steps:
@@ -73,7 +73,7 @@ jobs:
         run: npm install -g junit-report-merger
 
       - name: Merge reports
-        run: jrm ./ci-summary.xml "junit-test-summary-0/*.xml"
+        run: jrm ./ci-summary.xml "junit-test-summary-0/*.xml" "junit-test-summary-1/*.xml" "junit-test-summary-2/*.xml" "junit-test-summary-3/*.xml"
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
diff --git a/.github/workflows/nightly-tfe-ci.yml b/.github/workflows/nightly-tfe-ci.yml
index 78de61225..1d2f1905f 100644
--- a/.github/workflows/nightly-tfe-ci.yml
+++ b/.github/workflows/nightly-tfe-ci.yml
@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        total: [ 1 ]
-        index: [ 0 ]
+        total: [ 4 ]
+        index: [ 0, 1, 2, 3 ]
 
     steps:
       - name: terraform-cloud/outputs