Skip to content

Migrate to Ginkgo v2#11797

Merged
coutinhop merged 7 commits intoprojectcalico:masterfrom
hjiawei:ginkgov2
Feb 13, 2026
Merged

Migrate to Ginkgo v2#11797
coutinhop merged 7 commits intoprojectcalico:masterfrom
hjiawei:ginkgov2

Conversation

@hjiawei
Copy link
Contributor

@hjiawei hjiawei commented Feb 6, 2026

Description

This changeset migrates all test suites from Ginkgo v1 to v2. The major changes are in the Felix FV tests, where a static sharding helper configureManualSharding is implemented to preserve the v1-style "shard-nothing" execution and reporting behavior. It also adds a ReportAfterSuite hook to filter out skipped and pending tests, as well as standard output from passed tests, to avoid bloated JUnit reports.

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

TBD

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

@marvin-tigera marvin-tigera added this to the Calico v3.32.0 milestone Feb 6, 2026
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Feb 6, 2026
@hjiawei hjiawei force-pushed the ginkgov2 branch 8 times, most recently from 16b4b6d to 68970f4 Compare February 7, 2026 23:45
@hjiawei hjiawei marked this pull request as ready for review February 8, 2026 02:10
@hjiawei hjiawei requested review from a team as code owners February 8, 2026 02:10
Copilot AI review requested due to automatic review settings February 8, 2026 02:10
@hjiawei hjiawei added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact and removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Feb 8, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@hjiawei hjiawei requested a review from Copilot February 8, 2026 03:02
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@hjiawei hjiawei marked this pull request as draft February 8, 2026 05:50
@hjiawei hjiawei force-pushed the ginkgov2 branch 3 times, most recently from f742974 to 093a0d1 Compare February 8, 2026 23:54
@hjiawei
Copy link
Contributor Author

hjiawei commented Feb 9, 2026

UT/FV test results after this change:

image

Comparing to a master run:

image

@hjiawei hjiawei marked this pull request as ready for review February 9, 2026 06:44
Copy link
Member

@fasaxc fasaxc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😵‍💫 LGTM, one suggestion

github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 v2.27.2
github.com/onsi/gomega v1.38.2
github.com/onsi/ginkgo/v2 v2.28.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth a pre-flight check to ban accidental re-introduction of v1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a check-ginkgo-v2 preflight check in 07f5bf5.

@coutinhop coutinhop merged commit 4f68565 into projectcalico:master Feb 13, 2026
2 of 3 checks passed
@hjiawei hjiawei deleted the ginkgov2 branch February 13, 2026 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants