@@ -451,16 +451,21 @@ jobs:
451451 # Postgres tends not to choke.
452452 NUM_PARALLEL_PACKAGES=8
453453 NUM_PARALLEL_TESTS=16
454+ # Only the CLI and Agent are officially supported on Windows and the rest are too flaky
455+ PACKAGES="./cli/... ./enterprise/cli/... ./agent/..."
454456 elif [ "${{ runner.os }}" == "macOS" ]; then
455457 # Our macOS runners have 8 cores. We set NUM_PARALLEL_TESTS to 16
456458 # because the tests complete faster and Postgres doesn't choke. It seems
457459 # that macOS's tmpfs is faster than the one on Windows.
458460 NUM_PARALLEL_PACKAGES=8
459461 NUM_PARALLEL_TESTS=16
462+ # Only the CLI and Agent are officially supported on macOS and the rest are too flaky
463+ PACKAGES="./cli/... ./enterprise/cli/... ./agent/..."
460464 elif [ "${{ runner.os }}" == "Linux" ]; then
461465 # Our Linux runners have 8 cores.
462466 NUM_PARALLEL_PACKAGES=8
463467 NUM_PARALLEL_TESTS=8
468+ PACKAGES="./..."
464469 fi
465470
466471 # by default, run tests with cache
@@ -477,10 +482,7 @@ jobs:
477482 # invalidated. See scripts/normalize_path.sh for more details.
478483 normalize_path_with_symlinks "$RUNNER_TEMP/sym" "$(dirname $(which terraform))"
479484
480- # We rerun failing tests to counteract flakiness coming from Postgres
481- # choking on macOS and Windows sometimes.
482- gotestsum --rerun-fails=2 --rerun-fails-max-failures=50 \
483- --format standard-quiet --packages "./..." \
485+ gotestsum --format standard-quiet --packages "$PACKAGES" \
484486 -- -timeout=20m -v -p $NUM_PARALLEL_PACKAGES -parallel=$NUM_PARALLEL_TESTS $TESTCOUNT
485487
486488name :Upload Go Build Cache
@@ -550,7 +552,6 @@ jobs:
550552env :
551553POSTGRES_VERSION :" 17"
552554TS_DEBUG_DISCO :" true"
553- TEST_RETRIES :2
554555run :|
555556 make test-postgres
556557
@@ -604,7 +605,7 @@ jobs:
604605POSTGRES_VERSION :" 17"
605606run :|
606607 make test-postgres-docker
607- gotestsum --junitfile="gotests.xml" --packages="./..." --rerun-fails=2 --rerun-fails-abort-on-data-race -- -race -parallel 4 -p 4
608+ gotestsum --junitfile="gotests.xml" --packages="./..." -- -race -parallel 4 -p 4
608609
609610name :Upload Test Cache
610611uses :./.github/actions/test-cache/upload
@@ -726,7 +727,6 @@ jobs:
726727if :${{ !matrix.variant.premium }}
727728env :
728729DEBUG :pw:api
729- CODER_E2E_TEST_RETRIES :2
730730working-directory :site
731731
732732# Run all of the tests with a premium license
@@ -736,7 +736,6 @@ jobs:
736736DEBUG :pw:api
737737CODER_E2E_LICENSE :${{ secrets.CODER_E2E_LICENSE }}
738738CODER_E2E_REQUIRE_PREMIUM_TESTS :" 1"
739- CODER_E2E_TEST_RETRIES :2
740739working-directory :site
741740
742741 -name :Upload Playwright Failed Tests