@@ -383,8 +383,7 @@ jobs:
383383 touch ~/.bash_profile && echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bash_profile
384384 fi
385385 export TS_DEBUG_DISCO=true
386- gotestsum --junitfile="gotests.xml" --jsonfile="gotests.json" --rerun-fails=2 \
387- --packages="./..." -- $PARALLEL_FLAG -short
386+ gotestsum --junitfile="gotests.xml" --jsonfile="gotests.json" --packages="./..." -- $PARALLEL_FLAG -short
388387
389388name :Upload Test Cache
390389uses :./.github/actions/test-cache/upload
@@ -539,16 +538,21 @@ jobs:
539538 # Postgres tends not to choke.
540539 NUM_PARALLEL_PACKAGES=8
541540 NUM_PARALLEL_TESTS=16
541+ # Only the CLI and Agent are officially supported on Windows and the rest are too flaky
542+ PACKAGES="./cli/...,./enterprise/cli/...,./agent/..."
542543 elif [ "${{ runner.os }}" == "macOS" ]; then
543544 # Our macOS runners have 8 cores. We set NUM_PARALLEL_TESTS to 16
544545 # because the tests complete faster and Postgres doesn't choke. It seems
545546 # that macOS's tmpfs is faster than the one on Windows.
546547 NUM_PARALLEL_PACKAGES=8
547548 NUM_PARALLEL_TESTS=16
549+ # Only the CLI and Agent are officially supported on macOS and the rest are too flaky
550+ PACKAGES="./cli/...,./enterprise/cli/...,./agent/..."
548551 elif [ "${{ runner.os }}" == "Linux" ]; then
549552 # Our Linux runners have 8 cores.
550553 NUM_PARALLEL_PACKAGES=8
551554 NUM_PARALLEL_TESTS=8
555+ PACKAGES="./..."
552556 fi
553557
554558 # by default, run tests with cache
@@ -565,10 +569,7 @@ jobs:
565569 # invalidated. See scripts/normalize_path.sh for more details.
566570 normalize_path_with_symlinks "$RUNNER_TEMP/sym" "$(dirname $(which terraform))"
567571
568- # We rerun failing tests to counteract flakiness coming from Postgres
569- # choking on macOS and Windows sometimes.
570- DB=ci gotestsum --rerun-fails=2 --rerun-fails-max-failures=50 \
571- --format standard-quiet --packages "./..." \
572+ DB=ci gotestsum --format standard-quiet --packages "$PACKAGES" \
572573 -- -timeout=20m -v -p $NUM_PARALLEL_PACKAGES -parallel=$NUM_PARALLEL_TESTS $TESTCOUNT
573574
574575name :Upload Go Build Cache
@@ -638,7 +639,6 @@ jobs:
638639env :
639640POSTGRES_VERSION :" 17"
640641TS_DEBUG_DISCO :" true"
641- TEST_RETRIES :2
642642run :|
643643 make test-postgres
644644
@@ -689,7 +689,7 @@ jobs:
689689# c.f. discussion on https://github.com/coder/coder/pull/15106
690690 -name :Run Tests
691691run :|
692- gotestsum --junitfile="gotests.xml" --packages="./..." --rerun-fails=2 --rerun-fails-abort-on-data-race -- -race -parallel 4 -p 4
692+ gotestsum --junitfile="gotests.xml" --packages="./..." -- -race -parallel 4 -p 4
693693
694694name :Upload Test Cache
695695uses :./.github/actions/test-cache/upload
@@ -741,7 +741,7 @@ jobs:
741741POSTGRES_VERSION :" 17"
742742run :|
743743 make test-postgres-docker
744- DB=ci gotestsum --junitfile="gotests.xml" --packages="./..." --rerun-fails=2 --rerun-fails-abort-on-data-race -- -race -parallel 4 -p 4
744+ DB=ci gotestsum --junitfile="gotests.xml" --packages="./..." -- -race -parallel 4 -p 4
745745
746746name :Upload Test Cache
747747uses :./.github/actions/test-cache/upload
@@ -863,7 +863,6 @@ jobs:
863863if :${{ !matrix.variant.premium }}
864864env :
865865DEBUG :pw:api
866- CODER_E2E_TEST_RETRIES :2
867866working-directory :site
868867
869868# Run all of the tests with a premium license
@@ -873,7 +872,6 @@ jobs:
873872DEBUG :pw:api
874873CODER_E2E_LICENSE :${{ secrets.CODER_E2E_LICENSE }}
875874CODER_E2E_REQUIRE_PREMIUM_TESTS :" 1"
876- CODER_E2E_TEST_RETRIES :2
877875working-directory :site
878876
879877 -name :Upload Playwright Failed Tests