chore(e2e): rename e2e-next directory to e2e - #4128
Merged
Merged
Conversation
Mirrors the layout main has had since #4013 so backports land automatically. The shared backport flow re-roots a monorepo diff with `git diff --relative=staging/github.com/loft-sh/vcluster/` and applies it with `git apply --3way`; that patch is rooted at `e2e/`, so against `e2e-next/` there is no preimage blob to match and every test backport either conflicts or fabricates a second parallel tree. Also passes `test-dir: e2e` to run-ginkgo in both ginkgo workflows. The action defaults to `e2e-next` and does `cd "$TEST_DIR"`, so without this the suite would not run at all. Refs ENGQA-1484
Contributor
E2E Ginkgo Tests
|
adriankabala
marked this pull request as ready for review
July 31, 2026 08:45
janekbaraniewski
approved these changes
Jul 31, 2026
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.
Mirrors the layout main has had since #4013 so backports land automatically. The shared backport flow re-roots a monorepo diff with
git diff --relative=staging/github.com/loft-sh/vcluster/and applies it withgit apply --3way; that patch is rooted ate2e/, so againste2e-next/there is no preimage blob to match and every test backport either conflicts or fabricates a second parallel tree.Also passes
test-dir: e2eto run-ginkgo in both ginkgo workflows. The action defaults toe2e-nextand doescd "$TEST_DIR", so without this the suite would not run at all.What issue type does this pull request address? (keep at least one, remove the others)
/kind test
What does this pull request do? Which issues does it resolve? (use
resolves #<issue_number>if possible)resolves #
Refs ENGQA-1484
Please provide a short message that should be published in the vcluster release notes
Fixed an issue where vcluster ...
What else do we need to know?
E2E Tests
Default Test Execution
The mandatory PR suite runs automatically. Only specify additional test suites below if needed.
Adding New Test Suites
When adding a new ginkgo test suite:
Additional test suites
Additional test suite(s) that will be executed before the mandatory PR suite:
Note
Medium Risk
Large mechanical rename across CI and all E2E imports; wrong path in one workflow or script would skip or break the suite, but no production runtime behavior changes.
Overview
Renames the Ginkgo E2E tree from
e2e-nexttoe2eso it matchesmainand backport patches rooted ate2e/apply cleanly. The suite package is nowe2e(wase2e_next), and imports usegithub.com/loft-sh/vcluster/e2e/...throughout.CI and local tooling now target
./e2e: Ginkgo workflows passtest-dir: e2etorun-ginkgo(the action otherwise defaults toe2e-nextand would not run the suite). Change detection,Justfile/Justfile.agent,hack/test.shunit-test exclusions, and.golangci.ymlpath rules are updated the same way. Agent docs, E2E conventions, and CODEOWNERS paths are aligned with the new name.Reviewed by Cursor Bugbot for commit 35671f5. Bugbot is set up for automated code reviews on this repo. Configure here.