CNTRLPLANE-1311:Simplified test infrastructure to single-module architecture

Dockerfile.rhel7

@@ -3,7 +3,6 @@ WORKDIR /go/src/github.com/openshift/cluster-config-operator
 COPY . .
 ENV GO_PACKAGE github.com/openshift/cluster-config-operator
 RUN make build --warn-undefined-variables \
-    && make tests-ext-build \
     && gzip cluster-config-operator-tests-ext
 
 FROM registry.ci.openshift.org/ocp/4.21:base-rhel9

Makefile

@@ -20,41 +20,3 @@ IMAGE_REGISTRY?=registry.svc.ci.openshift.org
 $(call build-image,ocp-cluster-config-operator,$(IMAGE_REGISTRY)/ocp/4.2:cluster-config-operator,./Dockerfile.rhel7,.)
 
 $(call verify-golang-versions,Dockerfile.rhel7)
-
-clean:
-	$(RM) ./cluster-config-operator
-.PHONY: clean
-
-# -------------------------------------------------------------------
-# OpenShift Tests Extension (Cluster Config Operator)
-# -------------------------------------------------------------------
-TESTS_EXT_BINARY := cluster-config-operator-tests-ext
-TESTS_EXT_PACKAGE := ./cmd/cluster-config-operator-tests-ext
-
-TESTS_EXT_GIT_COMMIT := $(shell git rev-parse --short HEAD)
-TESTS_EXT_BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
-TESTS_EXT_GIT_TREE_STATE := $(shell if git diff --quiet; then echo clean; else echo dirty; fi)
-
-TESTS_EXT_LDFLAGS := -X 'github.com/openshift-eng/openshift-tests-extension/pkg/version.CommitFromGit=$(TESTS_EXT_GIT_COMMIT)' \
-                     -X 'github.com/openshift-eng/openshift-tests-extension/pkg/version.BuildDate=$(TESTS_EXT_BUILD_DATE)' \
-                     -X 'github.com/openshift-eng/openshift-tests-extension/pkg/version.GitTreeState=$(TESTS_EXT_GIT_TREE_STATE)'
-
-# -------------------------------------------------------------------
-# Build binary with metadata (CI-compliant)
-# -------------------------------------------------------------------
-.PHONY: tests-ext-build
-
-tests-ext-build:
-	GOOS=$(GOOS) GOARCH=$(GOARCH) GO_COMPLIANCE_POLICY=exempt_all CGO_ENABLED=0 \
-	go build -o $(TESTS_EXT_BINARY) -ldflags "$(TESTS_EXT_LDFLAGS)" $(TESTS_EXT_PACKAGE)
-
-# -------------------------------------------------------------------
-# Run "update" and strip env-specific metadata
-# -------------------------------------------------------------------
-.PHONY: tests-ext-update
-
-tests-ext-update: tests-ext-build
-	./$(TESTS_EXT_BINARY) update
-	for f in .openshift-tests-extension/*.json; do \
-		jq 'map(del(.codeLocations))' "$f" > tmpp && mv tmpp "$f"; \
-	done

README.md

@@ -8,3 +8,36 @@ The canonical location for OpenShift cluster configuration. This repo includes:
  1. The source of all CRD manifests for config.openshift.io
  2. A render command which creates the initial CRs for all config.openshift.io resource.
 
+## Tests
+
+This repository is compatible with the [OpenShift Tests Extension (OTE)](https://github.com/openshift-eng/openshift-tests-extension) framework.
+
+### Building the test binary
+
+```bash
+make build
+```
+
+### Running test suites and tests
+
+```bash
+# Run a specific test suite or test
+./cluster-config-operator-tests-ext run-suite openshift/cluster-config-operator/all
+./cluster-config-operator-tests-ext run-test "test-name"
+
+# Run with JUnit output
+./cluster-config-operator-tests-ext run-suite openshift/cluster-config-operator/all --junit-path /tmp/junit.xml
+```
+
+### Listing available tests and suites
+
+```bash
+# List all test suites
+./cluster-config-operator-tests-ext list suites
+
+# List tests in a suite
+./cluster-config-operator-tests-ext list tests --suite=openshift/cluster-config-operator/all
+```
+
+For more information about the OTE framework, see the [openshift-tests-extension documentation](https://github.com/openshift-eng/openshift-tests-extension).
+

cmd/cluster-config-operator-tests-ext/main.go

@@ -8,105 +8,59 @@ https://github.com/openshift-eng/openshift-tests-extension/blob/main/cmd/example
 package main
 
 import (
-	"fmt"
+	"context"
 	"os"
-	"strings"
-
-	"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"
+	"k8s.io/component-base/cli"
+
+	otecmd "github.com/openshift-eng/openshift-tests-extension/pkg/cmd"
+	oteextension "github.com/openshift-eng/openshift-tests-extension/pkg/extension"
+	"github.com/openshift/cluster-config-operator/pkg/version"
 
-	// The import below is necessary to ensure that the CCO operator tests are registered with the extension.
-	_ "github.com/openshift/cluster-config-operator/test/extended"
+	"k8s.io/klog/v2"
 )
 
 func main() {
-	registry := e.NewRegistry()
-	ext := e.NewExtension("openshift", "payload", "cluster-config-operator")
+	command := newOperatorTestCommand(context.Background())
+	code := cli.Run(command)
+	os.Exit(code)
+}
 
-	// Suite: conformance/parallel (fast, parallel-safe)
-	ext.AddSuite(e.Suite{
-		Name:    "openshift/cluster-config-operator/conformance/parallel",
-		Parents: []string{"openshift/conformance/parallel"},
-		Qualifiers: []string{
-			`!(name.contains("[Serial]") || name.contains("[Slow]"))`,
-		},
-	})
+func newOperatorTestCommand(ctx context.Context) *cobra.Command {
+	registry := prepareOperatorTestsRegistry()
 
-	// Suite: conformance/serial (explicitly serial tests)
-	ext.AddSuite(e.Suite{
-		Name:    "openshift/cluster-config-operator/conformance/serial",
-		Parents: []string{"openshift/conformance/serial"},
-		Qualifiers: []string{
-			`name.contains("[Serial]")`,
-		},
-	})
-
-	// Suite: optional/slow (long-running tests)
-	ext.AddSuite(e.Suite{
-		Name:    "openshift/cluster-config-operator/optional/slow",
-		Parents: []string{"openshift/optional/slow"},
-		Qualifiers: []string{
-			`name.contains("[Slow]")`,
+	cmd := &cobra.Command{
+		Use:   "cluster-config-operator-tests-ext",
+		Short: "A binary used to run cluster-config-operator tests as part of OTE.",
+		Run: func(cmd *cobra.Command, args []string) {
+			// no-op, logic is provided by the OTE framework
+			if err := cmd.Help(); err != nil {
+				klog.Fatal(err)
+			}
 		},
-	})
-
-	// Suite: all (includes everything)
-	ext.AddSuite(e.Suite{
-		Name: "openshift/cluster-config-operator/all",
-	})
-
-	specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite()
-	if err != nil {
-		panic(fmt.Sprintf("couldn't build extension test specs from ginkgo: %+v", err.Error()))
 	}
 
-	// Ensure [Disruptive] tests are also [Serial]
-	specs = specs.Walk(func(spec *et.ExtensionTestSpec) {
-		if strings.Contains(spec.Name, "[Disruptive]") && !strings.Contains(spec.Name, "[Serial]") {
-			spec.Name = strings.ReplaceAll(
-				spec.Name,
-				"[Disruptive]",
-				"[Serial][Disruptive]",
-			)
-		}
-	})
-
-	// Preserve original-name labels for renamed tests
-	specs = specs.Walk(func(spec *et.ExtensionTestSpec) {
-		for label := range spec.Labels {
-			if strings.HasPrefix(label, "original-name:") {
-				parts := strings.SplitN(label, "original-name:", 2)
-				if len(parts) > 1 {
-					spec.OriginalName = parts[1]
-				}
-			}
-		}
-	})
-
-	// Ignore obsolete tests
-	ext.IgnoreObsoleteTests(
-	// "[sig-config-operator] <test name here>",
-	)
-
-	// Initialize environment before running any tests
-	specs.AddBeforeAll(func() {
-		// do stuff
-	})
-
-	ext.AddSpecs(specs)
-	registry.Register(ext)
-
-	root := &cobra.Command{
-		Long: "Cluster Config Operator Tests Extension",
+	if v := version.Get().String(); len(v) == 0 {
+		cmd.Version = "<unknown>"
+	} else {
+		cmd.Version = v
 	}
 
-	root.AddCommand(cmd.DefaultExtensionCommands(registry)...)
+	cmd.AddCommand(otecmd.DefaultExtensionCommands(registry)...)
 
-	if err := root.Execute(); err != nil {
-		os.Exit(1)
-	}
+	return cmd
+}
+
+// prepareOperatorTestsRegistry creates the OTE registry for this operator.
+//
+// Note:
+//
+// This method must be called before adding the registry to the OTE framework.
+func prepareOperatorTestsRegistry() *oteextension.Registry {
+	registry := oteextension.NewRegistry()
+	extension := oteextension.NewExtension("openshift", "payload", "cluster-config-operator")
+
+	registry.Register(extension)
+	return registry
 }

go.mod

@@ -7,8 +7,6 @@ toolchain go1.24.5
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
-	github.com/onsi/ginkgo/v2 v2.23.4
-	github.com/onsi/gomega v1.38.0
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20250804142706-7b3ab438a292
 	github.com/openshift/api v0.0.0-20250806102053-6a7223edb2fc
 	github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
@@ -47,7 +45,6 @@ require (
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
@@ -67,6 +64,8 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/onsi/ginkgo/v2 v2.23.4 // indirect
+	github.com/onsi/gomega v1.38.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/profile v1.7.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -103,7 +102,6 @@ require (
 	golang.org/x/term v0.33.0 // indirect
 	golang.org/x/text v0.27.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/grpc v1.68.1 // indirect

go.sum

@@ -61,6 +61,7 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 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=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=