Skip to content

[chore][.github] Run scoped tests multiple times without retries #42498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mx-psi merged 1 commit into from
Sep 5, 2025
Merged

[chore][.github] Run scoped tests multiple times without retries #42498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scoped-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ jobs:
env:
CHANGED_GOLANG_SOURCES: ${{ needs.changedfiles.outputs.go_sources }}
run: |
make for-affected-components CMD="make"
make for-affected-components CMD="make lint test-three-times"
13 changes: 12 additions & 1 deletion Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ common: lint test
test: $(GOTESTSUM)
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." -- $(GOTEST_OPT)

# This target is used in scoped tests.
# We do not pass GOTESTSUM_OPT so that we do not re-run failures
# and run each changed test three times.
#
# This helps us catch flakes more easily before they land on main.
test-three-times: $(GOTESTSUM)
$(GOTESTSUM) --packages="./..." -- $(GOTEST_OPT) -count=3

.PHONY: test-with-cover
test-with-cover: $(GOTESTSUM)
mkdir -p $(PWD)/coverage/unit
Expand Down Expand Up @@ -292,6 +300,9 @@ for-affected-components:
fi \
fi

# Do not pass GOTESTSUM_OPT so that we do not re-run failures
# and run each changed test three times.
# This helps us catch flakes more easily before they land on main.
CHANGED_GOLANG_TESTS?=$(shell git diff main --name-only | grep -E '.*_test\.go$$')
.PHONY: run-changed-tests
run-changed-tests:
Expand All @@ -306,7 +317,7 @@ run-changed-tests:
else \
set -e; for dir in $$(echo $${AFFECTED_TEST_DIRS}); do \
(cd "$${dir}" && \
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." -- $(GOTEST_OPT) ); \
$(GOTESTSUM) --packages="./..." -- $(GOTEST_OPT) -count=3 ); \
done \
fi \
fi