Revert "Fix ginkgov2 conformance tests"

This reverts commit 32a9fc9.

Signed-off-by: Tobias Giese <[email protected]>

Author: tobiasgiese

go.mod

@@ -3,7 +3,6 @@ module sigs.k8s.io/cluster-api-provider-openstack
 go 1.19
 
 require (
-	github.com/blang/semver v3.5.1+incompatible
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-logr/logr v1.2.3
 	github.com/golang/mock v1.6.0
@@ -43,6 +42,7 @@ require (
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/coredns/caddy v1.1.0 // indirect

test/e2e/data/kubetest/conformance-fast-ginkgo-v2.yaml

@@ -5,4 +5,5 @@ ginkgo.progress: true
 ginkgo.slowSpecThreshold: 120.0
 ginkgo.flakeAttempts: 3
 ginkgo.trace: true
+ginkgo.timeout: 3h
 ginkgo.v: true

test/e2e/data/kubetest/conformance-fast.yaml

@@ -4,4 +4,5 @@ ginkgo.progress: true
 ginkgo.slowSpecThreshold: 120.0
 ginkgo.flakeAttempts: 3
 ginkgo.trace: true
+ginkgo.timeout: 3h
 ginkgo.v: true

test/e2e/data/kubetest/conformance-ginkgo-v2.yaml

@@ -24,9 +24,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
-	"strings"
 
-	"github.com/blang/semver"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -66,15 +64,6 @@ var _ = Describe("conformance tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 		}
 
-		// Starting with Kubernetes v1.25, the kubetest config file needs to be compatible with Ginkgo V2.
-		v125 := semver.MustParse("1.25.0-alpha.0.0")
-		v, err := semver.ParseTolerant(kubernetesVersion)
-		Expect(err).NotTo(HaveOccurred())
-		if v.GTE(v125) {
-			// Use the Ginkgo V2 config file.
-			e2eCtx.Settings.KubetestConfigFilePath = getGinkgoV2ConfigFilePath(e2eCtx.Settings.KubetestConfigFilePath)
-		}
-
 		workerMachineCount, err := strconv.ParseInt(e2eCtx.E2EConfig.GetVariable("CONFORMANCE_WORKER_MACHINE_COUNT"), 10, 64)
 		Expect(err).NotTo(HaveOccurred())
 		controlPlaneMachineCount, err := strconv.ParseInt(e2eCtx.E2EConfig.GetVariable("CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT"), 10, 64)
@@ -122,7 +111,3 @@ var _ = Describe("conformance tests", func() {
 		shared.DumpSpecResourcesAndCleanup(ctx, specName, namespace, e2eCtx)
 	})
 })
-
-func getGinkgoV2ConfigFilePath(kubetestConfigFilePath string) string {
-	return strings.Replace(kubetestConfigFilePath, ".yaml", "-ginkgo-v2.yaml", 1)
-}