test/cvo: Skip Proposal tests if the CRD is not installed

With 5687c39 (install: Drop Lightspeed CustomResourceDefinitions
(Proposal, etc.), 2026-06-24, #1412) dropping our handling of those
CRDs, we need to adjust the test harness to:

* Stop asserting the CRDs are installed (that's no longer our job)
  and...
* Make our Proposal-handling testing conditional on someone else
  (e.g. a step in a CI job's configuration) having installed the
  Proposal CRD.

Avoids [1]:

  : [Jira:"Cluster Version Operator"] cluster-version-operator should install light speed CRDs correctly expand_less	0s
  {  fail [github.com/openshift/cluster-version-operator/test/cvo/proposal.go:95]: Expected
      <*errors.StatusError | 0xc000910c80>:
      customresourcedefinitions.apiextensions.k8s.io "proposals.agentic.openshift.io" not found

[1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1412/pull-ci-openshift-cluster-version-operator-main-e2e-aws-ovn-techpreview/2069909194613460992

Author: wking

.openshift-tests-extension/openshift_payload_cluster-version-operator.json

@@ -86,16 +86,6 @@
     "lifecycle": "blocking",
     "environmentSelector": {}
   },
-  {
-    "name": "[Jira:\"Cluster Version Operator\"] cluster-version-operator should install light speed CRDs correctly",
-    "labels": {},
-    "resources": {
-      "isolation": {}
-    },
-    "source": "openshift:payload:cluster-version-operator",
-    "lifecycle": "blocking",
-    "environmentSelector": {}
-  },
   {
     "name": "[Jira:\"Cluster Version Operator\"] cluster-version-operator should create proposals",
     "labels": {

test/cvo/proposal.go

@@ -11,8 +11,6 @@ import (
 	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
-	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
@@ -39,12 +37,11 @@ func init() {
 var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`, func() {
 
 	var (
-		c                   *rest.Config
-		kubeClient          kubernetes.Interface
-		configClient        *configv1client.ConfigV1Client
-		apiExtensionsClient apiextensionsclientset.Interface
-		rtClient            ctrlruntimeclient.Client
-		err                 error
+		c            *rest.Config
+		kubeClient   kubernetes.Interface
+		configClient *configv1client.ConfigV1Client
+		rtClient     ctrlruntimeclient.Client
+		err          error
 
 		ctx         = context.Background()
 		needRecover bool
@@ -63,9 +60,6 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
 		configClient, err = configv1client.NewForConfig(c)
 		o.Expect(err).To(o.BeNil())
 
-		apiExtensionsClient, err = apiextensionsclientset.NewForConfig(c)
-		o.Expect(err).To(o.BeNil())
-
 		rtClient, err = ctrlruntimeclient.New(config.GetConfigOrDie(), ctrlruntimeclient.Options{})
 		o.Expect(err).To(o.BeNil())
 
@@ -88,20 +82,10 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
 		}
 	})
 
-	g.It("should install light speed CRDs correctly", func() {
-		for _, name := range []string{"proposals.agentic.openshift.io", "agents.agentic.openshift.io", "analysisresults.agentic.openshift.io", "llmproviders.agentic.openshift.io"} {
-			_, err := apiExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{})
-			if util.IsTechPreviewNoUpgrade(ctx, c) {
-				o.Expect(err).To(o.BeNil())
-			} else {
-				o.Expect(kerrors.IsNotFound(err)).To(o.BeTrue())
-			}
-		}
-	})
-
 	g.It("should create proposals", g.Label("OTA-1966"), g.Label("Serial"), oteginkgo.Informing(), func() {
 		o.Expect(util.SkipIfNetworkRestricted(ctx, c, util.FauxinnatiAPIURL)).To(o.BeNil())
 		util.SkipIfNotTechPreviewNoUpgrade(ctx, c)
+		util.SkipIfNoAPI(ctx, c, "proposals.agentic.openshift.io")
 
 		cv, err := configClient.ClusterVersions().Get(ctx, external.DefaultClusterVersionName, metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())

test/util/util.go

@@ -17,6 +17,7 @@ import (
 
 	authenticationv1 "k8s.io/api/authentication/v1"
 	corev1 "k8s.io/api/core/v1"
+	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -149,6 +150,19 @@ func SkipIfNotTechPreviewNoUpgrade(ctx context.Context, restConfig *rest.Config)
 	}
 }
 
+// SkipIfNoAPI skips the test if a the cluster does not have a particular CustomResourceDefinition.
+func SkipIfNoAPI(ctx context.Context, restConfig *rest.Config, apiName string) {
+	apiExtensionsClient, err := apiextensionsclientset.NewForConfig(restConfig)
+	o.Expect(err).To(o.BeNil())
+
+	_, err := apiExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, apiName, metav1.GetOptions{})
+	if apierrors.IsNotFound(err) {
+		g.Skipf("This test is skipped because the %s CustomResourceDefinition is not installed", apiName)
+	} else {
+		o.Expect(err).To(o.BeNil())
+	}
+}
+
 const (
 	// fauxinnati mocks Cincinnati Update Graph Server for OpenShift
 	FauxinnatiAPIURL = "https://fauxinnati-fauxinnati.apps.ota-stage.q2z4.p1.openshiftapps.com/api/upgrades_info/graph"