Merge pull request #1899 from wangke19/test-extd-revise

CNTRLPLANE-1248: Standardized scaffolding for tests extension

Author: openshift-merge-bot[bot]

.gitignore

@@ -1,5 +1,5 @@
 /cluster-kube-apiserver-operator
-/kube-apiserver-tests-ext
+/cluster-kube-apiserver-operator-tests-ext
 .idea/
 /_output/
 telepresence.log

Dockerfile.rhel7

@@ -4,7 +4,7 @@ COPY . .
 ENV GO_PACKAGE github.com/openshift/cluster-kube-apiserver-operator
 RUN make build --warn-undefined-variables \
     && make tests-ext-build \
-    && gzip kube-apiserver-tests-ext
+    && gzip cluster-kube-apiserver-operator-tests-ext
 
 FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/bindata/bootkube/bootstrap-manifests /usr/share/bootkube/manifests/bootstrap-manifests/
@@ -13,7 +13,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/bindata/bootkube/scc-manifests /usr/share/bootkube/manifests/manifests/
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/vendor/github.com/openshift/api/apiserver/v1/zz_generated.crd-manifests/kube-apiserver_apirequestcounts.crd.yaml /usr/share/bootkube/manifests/manifests/
 COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/cluster-kube-apiserver-operator /usr/bin/
-COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/kube-apiserver-tests-ext.gz /usr/bin/cluster-kube-apiserver-operator-tests-ext.gz
+COPY --from=builder /go/src/github.com/openshift/cluster-kube-apiserver-operator/cluster-kube-apiserver-operator-tests-ext.gz /usr/bin/
 
 COPY manifests /manifests
 COPY bindata/bootkube/scc-manifests /manifests

Makefile

@@ -17,8 +17,8 @@ IMAGE_REGISTRY :=registry.svc.ci.openshift.org
 ENCRYPTION_PROVIDERS=aescbc aesgcm
 ENCRYPTION_PROVIDER?=aescbc
 
-TESTS_EXT_BINARY := kube-apiserver-tests-ext
-TESTS_EXT_PACKAGE := ./cmd/kube-apiserver-tests-ext
+TESTS_EXT_BINARY := cluster-kube-apiserver-operator-tests-ext
+TESTS_EXT_PACKAGE := ./cmd/cluster-kube-apiserver-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')

cmd/cluster-kube-apiserver-operator-tests-ext/main.go

@@ -0,0 +1,112 @@
+/*
+This command is used to run the Cluster OpenShift API Server Operator tests extension for OpenShift.
+It registers the Cluster OpenShift API Server Operator tests with the OpenShift Tests Extension framework
+and provides a command-line interface to execute them.
+For further information, please refer to the documentation at:
+https://github.com/openshift-eng/openshift-tests-extension/blob/main/cmd/example-tests/main.go
+*/
+package main
+
+import (
+	"fmt"
+	"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"
+
+	// The import below is necessary to ensure that the OAS operator tests are registered with the extension.
+	_ "github.com/openshift/cluster-kube-apiserver-operator/test/extended"
+)
+
+func main() {
+	registry := e.NewRegistry()
+	ext := e.NewExtension("openshift", "payload", "cluster-kube-apiserve-operator")
+
+	// Suite: conformance/parallel (fast, parallel-safe)
+	ext.AddSuite(e.Suite{
+		Name:    "openshift/cluster-kube-apiserve-operator/conformance/parallel",
+		Parents: []string{"openshift/conformance/parallel"},
+		Qualifiers: []string{
+			`!(name.contains("[Serial]") || name.contains("[Slow]"))`,
+		},
+	})
+
+	// Suite: conformance/serial (explicitly serial tests)
+	ext.AddSuite(e.Suite{
+		Name:    "openshift/cluster-kube-apiserve-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-kube-apiserve-operator/optional/slow",
+		Parents: []string{"openshift/optional/slow"},
+		Qualifiers: []string{
+			`name.contains("[Slow]")`,
+		},
+	})
+
+	// Suite: all (includes everything)
+	ext.AddSuite(e.Suite{
+		Name: "openshift/cluster-kube-apiserve-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-openshift-apiserver] <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 OpenShift API Server Operator Tests Extension",
+	}
+
+	root.AddCommand(cmd.DefaultExtensionCommands(registry)...)
+
+	if err := root.Execute(); err != nil {
+		os.Exit(1)
+	}
+}

cmd/kube-apiserver-tests-ext/main.go

@@ -5,7 +5,7 @@ import (
 	o "github.com/onsi/gomega"
 )
 
-var _ = g.Describe("[Jira:KAS][sig-api-machinery] sanity test", func() {
+var _ = g.Describe("[Jira:kube-apiserver][sig-api-machinery] sanity test", func() {
 	g.It("should always pass [Suite:openshift/cluster-kube-apiserver-operator/conformance/parallel]", func() {
 		o.Expect(true).To(o.BeTrue())
 	})