Experiment with just using github.com/pulumi/shard

While github.com/pulumi/sharder should be optimal, github.com/pulumi/shard should approach
optimality as the number of tests grows. I want to see the degradation in test performance
we see when using a simpler solution.

Author: iwahbe

.github/workflows/build-and-test.yml

@@ -119,14 +119,10 @@ jobs:
       - name: Build PF
         run: cd pkg/pf && make build
       - name: Shard tests
-        run: echo "SHARD_CMD=$(go run github.com/pulumi/sharder@828907542fdc6628c49e5139d35fa1f427570550 --total ${{ env.TOTAL_SHARDS }} --index ${{ matrix.shard }} --output test-timings.jsonl --format make)" >> $GITHUB_ENV
-        if: ${{ matrix.platform == 'ubuntu-latest' }}
-      - name: Test
-        run: make VERBOSE=true test_shard
+        run: echo "RUN_TEST_CMD=$(go run github.com/pulumi/shard@5b6297aaffa0c06291fb8231968d7a9f4e6832e6 --total ${{ env.TOTAL_SHARDS }} --index ${{ matrix.shard }} --seed 42)" >> $GITHUB_ENV
         if: ${{ matrix.platform == 'ubuntu-latest' }}
       - name: Test
         run: make test
-        if: ${{ matrix.platform != 'ubuntu-latest' }}
       - name: Upload coverage reports to Codecov
         # If we have a CODECOV_TOKEN secret, then we upload it to get a coverage report.
         #

Makefile

@@ -27,27 +27,12 @@ lint:
 lint_fix:
 	go run scripts/build.go fix-lint
 
+RUN_TEST_CMD ?= ./...
 test:: install_plugins
 	@mkdir -p bin
 	go build -o bin ./internal/testing/pulumi-terraform-bridge-test-provider
 	PULUMI_TERRAFORM_BRIDGE_TEST_PROVIDER=$(shell pwd)/bin/pulumi-terraform-bridge-test-provider \
-		go test -count=1 -coverprofile="coverage.txt" -coverpkg=./... -timeout 2h -parallel ${TESTPARALLELISM} ./...
-
-# Run a single shard of tests. This is a make target for use in CI. It assumes the shard arguments are provided in SHARD_CMD
-test_shard:: install_plugins
-	@mkdir -p bin
-	go build -o bin ./internal/testing/pulumi-terraform-bridge-test-provider
-	PULUMI_TERRAFORM_BRIDGE_TEST_PROVIDER=$(shell pwd)/bin/pulumi-terraform-bridge-test-provider \
-		go test -count=1 -coverprofile="coverage.txt" -coverpkg=./... -timeout 2h -parallel ${TESTPARALLELISM} ./... ${SHARD_CMD}
-
-# Run the tests and record profiling data. This is used for partitioning tests into shards for CI.
-test_profile:: install_plugins
-	@mkdir -p bin
-	go build -o bin ./internal/testing/pulumi-terraform-bridge-test-provider
-	rm -f test-timings.jsonl
-	PULUMI_TERRAFORM_BRIDGE_TEST_PROVIDER=$(shell pwd)/bin/pulumi-terraform-bridge-test-provider \
-		go test -count=1 -timeout 2h -parallel ${TESTPARALLELISM} ./... -json | \
-		jq -c -r 'select((.Action == "pass" or .Action == "fail") and .Test != null)' | tee test-timings.jsonl
+		go test -count=1 -coverprofile="coverage.txt" -coverpkg=./... -timeout 2h -parallel ${TESTPARALLELISM} $(value RUN_TEST_CMD)
 
 # Run tests while accepting current output as expected output "golden"
 # tests. In case where system behavior changes intentionally this can