diff --git a/Makefile b/Makefile index d126e4e53..80feb547b 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ test-ext-dev-e2e: $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run extension creat go test -count=1 -v ./test/extension-developer-e2e/... ENVTEST_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/') -UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/ | grep -v /catalogd/test/) +UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/) COVERAGE_UNIT_DIR := $(ROOT_DIR)/coverage/unit .PHONY: envtest-k8s-bins #HELP Uses setup-envtest to download and install the binaries required to run ENVTEST-test based locally at the project/bin directory. diff --git a/commitchecker.yaml b/commitchecker.yaml index a49475234..9b5b1a8a5 100644 --- a/commitchecker.yaml +++ b/commitchecker.yaml @@ -1,4 +1,4 @@ -expectedMergeBase: a6de9f94e085989a086459f2b5325a5cd27424b0 +expectedMergeBase: 01755a80c407b4452e64d816e18e00c189162c4b upstreamBranch: main upstreamOrg: operator-framework upstreamRepo: operator-controller