ci: run tests with ginkgo cli

.circleci/config.yml

@@ -83,8 +83,8 @@ jobs:
           name: Docker login
           command: echo $AZURE_DOCKER_REGISTRY_PASSWORD | docker login --username $AZURE_DOCKER_REGISTRY_USERNAME --password-stdin graviteeio.azurecr.io
       - run:
-          name: Install gotestsum
-          command: make gotestsum
+          name: Install ginkgo
+          command: make ginkgo
       - run:
           name: Start APIM using k3d
           command: |
@@ -93,9 +93,9 @@ jobs:
             make k3d-apim-init
       - run:
           name: Run tests
-          command: GOTESTARGS="--junitfile=/tmp/junit/reports/junit.xml" make test
+          command: GOTESTARGS="--output-dir=/tmp/junit/reports --junit-report=junit.xml" make test
       - store_test_results:
-          path: /tmp/junit
+          path: /tmp/junit/reports
 
   login-to-azure:
     executor:

.gitignore

@@ -14,6 +14,8 @@ testbin/*
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+*.out.*
+junit.xml
 
 # Kubernetes Generated files - skip generated files, except for vendored files
 
@@ -32,4 +34,4 @@ gko-config-default.yml
 
 # K8S OLM 
 cache/
-bundle/
+bundle/

Makefile

@@ -120,9 +120,9 @@ lint-license: addlicense ## Run addlicense lint and fail on error
 
 GOTESTARGS ?= ""
 .PHONY: test
-test: manifests generate install## Run tests.
+test: manifests generate install ## Run tests.
 	kubectl config use-context k3d-graviteeio
-	KUBEBUILDER_ASSETS=USE_EXISTING_CLUSTER=true $(GOTESTSUM) $(GOTESTARGS) ./... -timeout 380s -coverprofile cover.out
+	KUBEBUILDER_ASSETS=USE_EXISTING_CLUSTER=true $(GINKGO) $(GOTESTARGS) -timeout 380s --cover --coverprofile=cover.out ./...
 
 .PHONY: k3d-apim-init
 k3d-apim-init: ## Init APIM locally using k3d
@@ -209,7 +209,7 @@ $(LOCALBIN):
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
-GOTESTSUM ?= $(LOCALBIN)/gotestsum
+GINKGO ?= $(LOCALBIN)/ginkgo
 CRDOC ?= $(LOCALBIN)/crdoc
 GOLANGCILINT ?= $(LOCALBIN)/golangci-lint
 ADDLICENSE ?= $(LOCALBIN)/addlicense
@@ -235,10 +235,10 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
 	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
-.PHONY: gotestsum
-gotestsum: $(GOTESTSUM) ## Download gotestsum locally if necessary.
-$(GOTESTSUM): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install gotest.tools/gotestsum@latest
+.PHONY: ginkgo
+ginkgo: $(GINKGO) ## Download ginkgo cli locally if necessary.
+$(GINKGO): $(LOCALBIN)
+	GOBIN=$(LOCALBIN) go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
 .PHONY: crdoc
 crdoc: $(CRDOC)

go.mod

@@ -3,6 +3,7 @@ module github.com/gravitee-io/gravitee-kubernetes-operator
 go 1.19
 
 require (
+	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/ginkgo/v2 v2.4.0
 	github.com/onsi/gomega v1.23.0
 	k8s.io/apimachinery v0.25.3
@@ -13,7 +14,6 @@ require (
 require (
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
 	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -37,8 +37,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-logr/logr v1.2.3
 	github.com/go-logr/zapr v1.2.3 // indirect