🌱 Remove ginkgo from e2e tests

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

Makefile

@@ -105,16 +105,16 @@ test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests.
 .PHONY: e2e
 FOCUS := $(if $(TEST),-v -focus "$(TEST)")
 E2E_FLAGS ?= ""
-e2e: $(GINKGO) #EXHELP Run the e2e tests.
-	$(GINKGO) --tags $(GO_BUILD_TAGS) $(E2E_FLAGS) -trace -progress $(FOCUS) test/e2e
+e2e: $(SETUP_ENVTEST) #EXHELP Run the e2e tests.
+	eval $$($(SETUP_ENVTEST) use -p env $(ENVTEST_VERSION)) && go test -tags $(GO_BUILD_TAGS) -v $(shell go list ./test/e2e)
 
 export REG_PKG_NAME=registry-operator
 export PLAIN_PKG_NAME=plain-operator
 export CATALOG_IMG=${E2E_REGISTRY_NAME}.${E2E_REGISTRY_NAMESPACE}.svc:5000/test-catalog:e2e
 .PHONY: test-op-dev-e2e
-test-op-dev-e2e: $(GINKGO) $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run operator create, upgrade and delete tests.
+test-op-dev-e2e: $(SETUP_ENVTEST) $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run operator create, upgrade and delete tests.
 	test/operator-framework-e2e/setup.sh $(OPERATOR_SDK) $(CONTAINER_RUNTIME) $(KUSTOMIZE) $(KIND) $(KIND_CLUSTER_NAME) ${E2E_REGISTRY_NAMESPACE}
-	$(GINKGO) --tags $(GO_BUILD_TAGS) -trace -progress $(FOCUS) test/operator-framework-e2e
+	eval $$($(SETUP_ENVTEST) use -p env $(ENVTEST_VERSION)) && go test -tags $(GO_BUILD_TAGS) -v $(shell go list ./test/operator-framework-e2e)
 
 .PHONY: test-unit
 ENVTEST_VERSION = $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/')

test/e2e/e2e_suite_test.go

@@ -2,17 +2,15 @@ package e2e
 
 import (
 	"context"
+	"os"
 	"testing"
-	"time"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/utils/env"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -33,41 +31,23 @@ const (
 	testCatalogName      = "test-catalog"
 )
 
-func TestE2E(t *testing.T) {
-	RegisterFailHandler(Fail)
-	SetDefaultEventuallyTimeout(1 * time.Minute)
-	SetDefaultEventuallyPollingInterval(1 * time.Second)
-	RunSpecs(t, "E2E Suite")
-}
-
-var _ = BeforeSuite(func() {
+func TestMain(m *testing.M) {
 	cfg = ctrl.GetConfigOrDie()
 
 	scheme := runtime.NewScheme()
 
-	Expect(operatorv1alpha1.AddToScheme(scheme)).To(Succeed())
-	Expect(rukpakv1alpha1.AddToScheme(scheme)).To(Succeed())
-	Expect(catalogd.AddToScheme(scheme)).To(Succeed())
+	utilruntime.Must(operatorv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(rukpakv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(catalogd.AddToScheme(scheme))
+	utilruntime.Must(appsv1.AddToScheme(scheme))
+	utilruntime.Must(corev1.AddToScheme(scheme))
 
 	var err error
-
-	err = appsv1.AddToScheme(scheme)
-	Expect(err).ToNot(HaveOccurred())
-
-	err = corev1.AddToScheme(scheme)
-	Expect(err).ToNot(HaveOccurred())
-
 	c, err = client.New(cfg, client.Options{Scheme: scheme})
-	Expect(err).To(Not(HaveOccurred()))
-})
+	utilruntime.Must(err)
 
-var _ = AfterSuite(func() {
-	ctx := context.Background()
-	if basePath := env.GetString("ARTIFACT_PATH", ""); basePath != "" {
-		// get all the artifacts from the test run and save them to the artifact path
-		getArtifactsOutput(ctx, basePath)
-	}
-})
+	os.Exit(m.Run())
+}
 
 // createTestCatalog will create a new catalog on the test cluster, provided
 // the context, catalog name, and the image reference. It returns the created catalog