Skip to content
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.

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

Update ginkgo v2 #69

Merged
merged 5 commits into from
Feb 2, 2023
Merged

Conversation

razo7
Copy link
Member

@razo7 razo7 commented Jan 2, 2023

NMO has been using the last Ginkgo v1 version, v1.16.5, from Oct 2021.
This PR bumps to a new major release of Ginkgo, and to the latest Ginkgo version, v2.8.0.

  • Replace ginkgo to ginkgo/v2
  • Run make go-verify
  • Apply Ginkgo v2 changes (RunSpecs, removing timeout BeforeSuite, and new flag names)

@razo7
Copy link
Member Author

razo7 commented Jan 31, 2023

/retest

Ginkgo v1.16.5 is the last Ginkgo v1 release, Oct 2021, before bumping to a new major release which has been introduced on 2022. Ginkgo v2.8.0 is the latest version and it has been releasd on Jan 2023.
Add missing and remove unused modules, make vendored copy of dependencies, and verify dependencies have expected content.
@razo7 razo7 changed the title [WIP] Update ginkgo v2 Update ginkgo v2 Feb 1, 2023
Copy link
Contributor

@clobrano clobrano left a comment

Choose a reason for hiding this comment

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

/lgtm
Giving others a chance to review as well, feel free to unhold
/hold

Makefile Outdated
@@ -177,7 +177,7 @@ test: test-no-verify verify-unchanged ## Generate and format code, run tests, ge

.PHONY: test-no-verify
test-no-verify: manifests generate go-verify fmt vet envtest ginkgo ## Generate and format code, and run tests
ACK_GINKGO_DEPRECATIONS=$(GINKGO_VERSION) KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -v -r --keepGoing -requireSuite ./api/... ./controllers/... -coverprofile cover.out
ACK_GINKGO_DEPRECATIONS=$(GINKGO_VERSION) KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -v -r --keep-going -require-suite ./api/... ./controllers/... -coverprofile cover.out
Copy link
Member

Choose a reason for hiding this comment

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

probably ACK_GINKGO_DEPRECATIONS can be removed?

hack/functest.sh Outdated
ACK_GINKGO_DEPRECATIONS=$1 ./bin/ginkgo/$1/ginkgo $NO_COLOR -v -r --keepGoing -requireSuite ./test/e2e
# --keep-going: don't stop on failing suite
# -require-suite: fail if tests are not executed because of missing suite
ACK_GINKGO_DEPRECATIONS=$1 ./bin/ginkgo/$1/ginkgo $NO_COLOR -v -r --keep-going -require-suite ./test/e2e
Copy link
Member

Choose a reason for hiding this comment

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

same here

Use name for suites
Not supported in Ginkgo v2
Ginkgo v2 supports different naming for flags
@razo7
Copy link
Member Author

razo7 commented Feb 2, 2023

/retest

Copy link
Member

@slintes slintes left a comment

Choose a reason for hiding this comment

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

please remove the last line from the description 😉

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 2, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: razo7, slintes

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@razo7
Copy link
Member Author

razo7 commented Feb 2, 2023

/unhold

@openshift-merge-robot openshift-merge-robot merged commit 56ed8e7 into medik8s:main Feb 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants