[WINC-1777] Use upstream Ginkgo by manually registering OTE specs

Switch from BuildExtensionTestSpecsFromOpenShiftGinkgoSuite() (which requires
the OpenShift Ginkgo fork) to manually registering ExtensionTestSpecs with
plain Go functions.

Changes:
- cmd/main.go: register specs manually via et.ExtensionTestSpecs, remove
  import of OTE ginkgo helper package
- test/extended/winc.go: rewrite OCP-37362 as a plain Go function
  CheckWmcoGolangVersion() returning error instead of using Ginkgo g.It
- test/extended/suite_test.go: removed (no longer needed)
- go.mod: remove OpenShift ginkgo fork replace directive; upstream
  github.com/onsi/ginkgo/v2 v2.22.2 is used directly
- vendor: cleaned up ~250 files from the ginkgo fork and its transitive deps

This avoids adding the OpenShift Ginkgo fork to WMCO's dependency tree,
keeping the operator's go.mod clean as requested.

Jira: WINC-1777

Author: weinliu

cmd/windows-machine-config-operator-tests-ext/main.go

@@ -1,26 +1,23 @@
 // windows-machine-config-operator-tests-ext is the OTE (OpenShift Tests Extension)
-// binary for Windows Containers tests. It wraps WINC Ginkgo tests and exposes them
-// through the standardized OTE interface (info / list / run-test / run-suite).
+// binary for Windows Containers tests. Tests are registered as plain Go functions
+// using upstream Ginkgo, without the OpenShift Ginkgo fork.
 //
 // References:
 //   - OTE Integration Guide: https://github.com/openshift-eng/openshift-tests-extension
-//   - Similar implementation (NTO): https://github.com/openshift/cluster-node-tuning-operator/blob/main/cmd/cluster-node-tuning-operator-test-ext/main.go
-//   - Similar implementation (MCO): https://github.com/openshift/machine-config-operator/blob/master/cmd/machine-config-tests-ext/main.go
 package main
 
 import (
-	"fmt"
+	"context"
 	"os"
-	"strings"
+
+	"github.com/spf13/cobra"
 
 	otecmd "github.com/openshift-eng/openshift-tests-extension/pkg/cmd"
 	e "github.com/openshift-eng/openshift-tests-extension/pkg/extension"
 	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
-	g "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo"
-	"github.com/spf13/cobra"
 
-	_ "github.com/openshift/windows-machine-config-operator/test/extended"
-	// Register WINC Ginkgo tests.
+	"github.com/openshift/windows-machine-config-operator/test/extended"
+	"github.com/openshift/windows-machine-config-operator/test/extended/utils"
 )
 
 func main() {
@@ -36,9 +33,6 @@ func main() {
 	})
 
 	// Parallel subset: non-Serial, non-Slow, non-Disruptive tests.
-	// Renamed from windows/conformance/parallel until tests carry an explicit
-	// conformance marker and achieve >=99% pass rate, at which point Parents
-	// pointing to openshift/conformance/parallel will be added.
 	ext.AddSuite(e.Suite{
 		Name: "windows/parallel",
 		Qualifiers: []string{
@@ -47,7 +41,6 @@ func main() {
 	})
 
 	// Serial subset: tests that must run in isolation.
-	// Renamed from windows/conformance/serial for the same reason as above.
 	ext.AddSuite(e.Suite{
 		Name: "windows/serial",
 		Qualifiers: []string{
@@ -63,13 +56,19 @@ func main() {
 		},
 	})
 
-	specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite()
-	if err != nil {
-		panic(fmt.Sprintf("couldn't build extension test specs from ginkgo: %v", err))
+	// Register test specs manually — no OpenShift Ginkgo fork required.
+	specs := et.ExtensionTestSpecs{
+		{
+			Name: "[sig-windows] Windows_Containers Author:rrasouli-Smokerun-Medium-37362-[wmco] wmco using correct golang version [OTP]",
+			Run: func(ctx context.Context) *et.ExtensionTestResult {
+				if err := extended.CheckWmcoGolangVersion(ctx, utils.NewCLIWithoutNamespace()); err != nil {
+					return &et.ExtensionTestResult{Result: et.ResultFailed, Output: err.Error()}
+				}
+				return &et.ExtensionTestResult{Result: et.ResultPassed}
+			},
+		},
 	}
 
-	applyPlatformFilters(specs)
-
 	ext.AddSpecs(specs)
 	registry.Register(ext)
 
@@ -85,21 +84,3 @@ func main() {
 		os.Exit(1)
 	}
 }
-
-// applyPlatformFilters converts "Platform:<name>" and "NoPlatform:<name>" Ginkgo
-// labels into OTE include/exclude constraints so that openshift-tests can filter
-// tests before execution rather than relying on g.Skip() inside the test body.
-func applyPlatformFilters(specs et.ExtensionTestSpecs) {
-	specs.Walk(func(spec *et.ExtensionTestSpec) {
-		for label := range spec.Labels {
-			if strings.HasPrefix(label, "Platform:") {
-				platform := strings.TrimPrefix(label, "Platform:")
-				spec.Include(et.PlatformEquals(platform))
-			}
-			if strings.HasPrefix(label, "NoPlatform:") {
-				platform := strings.TrimPrefix(label, "NoPlatform:")
-				spec.Exclude(et.PlatformEquals(platform))
-			}
-		}
-	})
-}

go.mod

@@ -8,9 +8,6 @@ replace (
 	// fix CVE-2025-30204 transitive deps still using older v4. Remove once `go mod graph` shows only 4.5.2 or higher
 	github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2
-	// Required for openshift-tests-extension compatibility (uses OpenShift's ginkgo fork).
-	// TODO: confirm with Mansi whether this can be avoided with upstream Ginkgo.
-	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12
 )
 
 require (
@@ -19,8 +16,6 @@ require (
 	github.com/coreos/ignition/v2 v2.23.0
 	github.com/go-imports-organizer/goio v1.5.0
 	github.com/go-logr/logr v1.4.3
-	github.com/onsi/ginkgo/v2 v2.22.2
-	github.com/onsi/gomega v1.36.2
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
 	github.com/openshift/api v0.0.0-20260213204242-d34f11c515b3
 	github.com/openshift/client-go v0.0.0-20260213141500-06efc6dce93b
@@ -92,13 +87,11 @@ require (
 	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
 	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
 	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.26.0 // indirect
 	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -117,6 +110,8 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/ginkgo/v2 v2.22.2 // indirect
+	github.com/onsi/gomega v1.36.2 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -150,7 +145,6 @@ require (
 	golang.org/x/term v0.40.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
-	golang.org/x/tools v0.41.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect

go.sum

@@ -275,6 +275,7 @@ github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85n
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
@@ -504,6 +505,8 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
+github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
@@ -520,8 +523,6 @@ github.com/openshift/client-go v0.0.0-20260213141500-06efc6dce93b h1:7rTnxq+haKr
 github.com/openshift/client-go v0.0.0-20260213141500-06efc6dce93b/go.mod h1:V3s8weD4bKXGXaN7d9g3V1QS2gmlYBRI2i/lfIwmroM=
 github.com/openshift/library-go v0.0.0-20260213153706-03f1709971c5 h1:9Pe6iVOMjt9CdA/vaKBNUSoEIjIe1po5Ha3ABRYXLJI=
 github.com/openshift/library-go v0.0.0-20260213153706-03f1709971c5/go.mod h1:K3FoNLgNBFYbFuG+Kr8usAnQxj1w84XogyUp2M8rK8k=
-github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI=
-github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/operator-framework/api v0.5.2/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
 github.com/operator-framework/api v0.16.0 h1:swUOhVv7QDszxBTwYM8QAtyeqI4EQHNVAiKMS+xjakY=
 github.com/operator-framework/api v0.16.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q=

test/extended/suite_test.go

@@ -1,50 +1,53 @@
 package extended
 
 import (
+	"context"
 	"encoding/json"
+	"fmt"
 	"strings"
 
-	g "github.com/onsi/ginkgo/v2"
-	o "github.com/onsi/gomega"
-
 	"github.com/openshift/windows-machine-config-operator/test/extended/utils"
 )
 
 const (
 	wmcoNamespace = "openshift-windows-machine-config-operator"
 )
 
-var _ = g.Describe("[sig-windows] Windows_Containers", func() {
-	var oc = utils.NewCLIWithoutNamespace()
-
-	// author: rrasouli@redhat.com
-	// OCP-37362 - Pilot case for OTE migration to WMCO
-	g.It("Author:rrasouli-Smokerun-Medium-37362-[wmco] wmco using correct golang version [OTP]", func() {
-		g.By("Fetch the correct golang version from cluster")
-		serverVersion, err := oc.AsAdmin().Output("get", "--raw", "/version")
-		o.Expect(err).NotTo(o.HaveOccurred())
-
-		// Unmarshal the version response to extract goVersion safely.
-		var versionInfo struct {
-			GoVersion string `json:"goVersion"`
-		}
-		o.Expect(json.Unmarshal([]byte(serverVersion), &versionInfo)).To(o.Succeed(),
-			"failed to parse /version JSON response")
-		o.Expect(versionInfo.GoVersion).NotTo(o.BeEmpty(), "goVersion not found in /version response")
-
-		// Truncate to major.minor (e.g. "go1.24.6" -> "go1.24")
-		parts := strings.Split(versionInfo.GoVersion, ".")
-		o.Expect(len(parts)).To(o.BeNumerically(">=", 2), "unexpected golang version format: %s", versionInfo.GoVersion)
-		truncated := strings.Join(parts[:2], ".")
-		g.GinkgoWriter.Printf("Golang version: %s, truncated: %s\n", versionInfo.GoVersion, truncated)
-
-		g.By("Compare with golang version in WMCO logs")
-		logs, err := oc.AsAdmin().Output("logs",
-			"deployment.apps/windows-machine-config-operator",
-			"-n", wmcoNamespace,
-		)
-		o.Expect(err).NotTo(o.HaveOccurred())
-		o.Expect(logs).To(o.ContainSubstring(truncated),
-			"WMCO logs do not contain expected golang version %s", truncated)
-	})
-})
+// CheckWmcoGolangVersion verifies that the golang version reported by the cluster
+// matches the version used to build the WMCO binary (OCP-37362).
+func CheckWmcoGolangVersion(_ context.Context, oc *utils.CLI) error {
+	serverVersion, err := oc.AsAdmin().Output("get", "--raw", "/version")
+	if err != nil {
+		return fmt.Errorf("failed to get cluster version: %w", err)
+	}
+
+	var versionInfo struct {
+		GoVersion string `json:"goVersion"`
+	}
+	if err := json.Unmarshal([]byte(serverVersion), &versionInfo); err != nil {
+		return fmt.Errorf("failed to parse /version JSON: %w", err)
+	}
+	if versionInfo.GoVersion == "" {
+		return fmt.Errorf("goVersion not found in /version response")
+	}
+
+	parts := strings.Split(versionInfo.GoVersion, ".")
+	if len(parts) < 2 {
+		return fmt.Errorf("unexpected golang version format: %s", versionInfo.GoVersion)
+	}
+	truncated := strings.Join(parts[:2], ".")
+
+	logs, err := oc.AsAdmin().Output("logs",
+		"deployment.apps/windows-machine-config-operator",
+		"-n", wmcoNamespace,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to get WMCO logs: %w", err)
+	}
+
+	if !strings.Contains(logs, truncated) {
+		return fmt.Errorf("WMCO logs do not contain expected golang version %s (full: %s)",
+			truncated, versionInfo.GoVersion)
+	}
+	return nil
+}