🌱 ci: use ginkgo --flake-attempts instead of nick-invision/retry for e2e tests#5013
Merged
spencerschrock merged 3 commits intoossf:mainfrom Apr 27, 2026
Merged
Conversation
alliasgher
requested review from
jeffmendoza and
spencerschrock
and removed request for
a team
dosubot
Bot
added
the
size:S
alliasgher
changed the title
…e tests Replace the nick-invision/retry GitHub Action wrapper around e2e test targets with ginkgo's built-in --flake-attempts=3 flag. This retries only the individual specs that fail rather than re-running the entire suite, saving GitHub API token quota and CI time. Changes: - Makefile: add --flake-attempts=3 to all ginkgo e2e targets (e2e-pat, e2e-gh-token, e2e-gitlab-token, e2e-gitlab, e2e-azure-devops-token) - main.yml: remove retry wrapper from PAT e2e step - integration.yml: remove retry wrapper from GITHUB_TOKEN e2e step - gitlab.yml: remove retry wrapper from both GitLab e2e steps Non-e2e retry wrappers (generate-mocks, generate-docs, publishimage) are intentionally left unchanged as they don't use ginkgo. Fixes ossf#2897 Signed-off-by: Ali <alliasgher123@gmail.com>
alliasgher
force-pushed
the
ci-use-ginkgo-flake-attempts
branch
from
591d9c9 to
a2b5802
Compare
Member
|
Did you take a look at the timeout field? I vaguely remember there being a motivation for having it, but I'm a little rusty on the issue |
Signed-off-by: Ali <alliasgher123@gmail.com>
Contributor
Author
|
Good catch — added back |
alliasgher
temporarily deployed
to
integration-test
GitHub Actions
Inactive
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #5013 +/- ##
==========================================
+ Coverage 66.80% 69.78% +2.98%
==========================================
Files 230 252 +22
Lines 16602 15736 -866
==========================================
- Hits 11091 10982 -109
+ Misses 4808 3873 -935
- Partials 703 881 +178 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Replace the
nick-invision/retryGitHub Action with ginkgo's built-in--flake-attempts=3for all e2e test targets. This retries only the individual specs that fail rather than re-running the entire test suite.Motivation
As described in #2897, when an e2e test fails, the retry action re-runs
make e2e-*from scratch — all 54+ specs. With--flake-attempts=3, ginkgo retries only the failed spec up to 3 times in-process, saving:Changes
Makefile
Added
--flake-attempts=3to all ginkgo e2e targets:e2e-pate2e-gh-tokene2e-gitlab-tokene2e-gitlabe2e-azure-devops-tokenWorkflows
Removed
nick-invision/retrywrapper from e2e steps in:.github/workflows/main.yml(PAT e2e).github/workflows/integration.yml(GITHUB_TOKEN e2e).github/workflows/gitlab.yml(both GitLab e2e steps)Non-e2e retry wrappers (generate-mocks, generate-docs, publishimage) are intentionally unchanged — they don't use ginkgo.
Fixes #2897