UPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go

Author: camilamacedo86

openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json

@@ -8,5 +8,15 @@
     "source": "openshift:payload:olmv1",
     "lifecycle": "blocking",
     "environmentSelector": {}
+  },
+  {
+    "name": "[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 CRDs should be installed",
+    "labels": {},
+    "resources": {
+      "isolation": {}
+    },
+    "source": "openshift:payload:olmv1",
+    "lifecycle": "blocking",
+    "environmentSelector": {}
   }
 ]

openshift/tests-extension/README.md

@@ -15,6 +15,110 @@ They use the framework: https://github.com/openshift-eng/openshift-tests-extensi
 | `./bin/olmv1-tests-ext run-suite olmv1/all`     | Runs the full OLMv1 test suite.                                          |
 | `./bin/olmv1-tests-ext run-test -n <test-name>` | Runs one specific test. Replace <test-name> with the test's full name.   |
 
+## How to Run the Tests locally
+
+The tests can be run locally using the `olmv1-tests-ext` binary against an OpenShift cluster or a vanilla Kubernetes cluster.
+Features and checks which are OpenShift-specific will be skipped when running against a vanilla Kubernetes cluster.
+
+Use the environment variable `KUBECONFIG` to point to your cluster configuration file.
+
+```shell
+KUBECONFIG=path/to/kubeconfig ./bin/olmv1-tests-ext run-test -n <test-name>
+```
+
+### Local Test using OLMv1 and Kind
+
+**Prerequisites:**
+
+Install OLMv1 before running the tests. 
+You can use the `kind` tool to create a local Kubernetes cluster with OLMv1 installed.
+Furthermore, if you are using feature gates in your test you will need to
+ensure that those are enabled in your cluster.
+
+**Example:**
+
+export KUBECONFIG=$HOME/.kube/config
+
+```shell
+$ ./bin/olmv1-tests-ext run-suite olmv1/all
+  Running Suite:  - /Users/camilam/go/src/github/operator-framework-operator-controller/openshift/tests-extension
+  ===============================================================================================================
+  Random Seed: 1753508546 - will randomize all specs
+
+  Will run 1 of 1 specs
+  ------------------------------
+  [sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 CRDs should verify required CRDs are installed and active
+  /Users/camilam/go/src/github/operator-framework-operator-controller/openshift/tests-extension/test/olmv1.go:37
+  [INFO] [env] Using kubeconfig: /Users/camilam/.kube/config[WARN] Skipping feature capability check: not OpenShift  STEP: verifying CRD clusterextensions.olm.operatorframework.io @ 07/26/25 06:42:26.57
+    STEP: verifying CRD clustercatalogs.olm.operatorframework.io @ 07/26/25 06:42:26.575
+  • [0.026 seconds]
+  ------------------------------
+
+  Ran 1 of 1 Specs in 0.026 seconds
+  SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 0 Skipped
+  Running Suite:  - /Users/camilam/go/src/github/operator-framework-operator-controller/openshift/tests-extension
+  ===============================================================================================================
+  Random Seed: 1753508546 - will randomize all specs
+
+  Will run 1 of 1 specs
+  ------------------------------
+  [sig-olmv1] OLMv1 should pass a trivial sanity check
+  /Users/camilam/go/src/github/operator-framework-operator-controller/openshift/tests-extension/test/olmv1.go:26
+  • [0.000 seconds]
+  ------------------------------
+
+  Ran 1 of 1 Specs in 0.000 seconds
+  SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 0 Skipped
+[
+  {
+    "name": "[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 CRDs should verify required CRDs are installed and active",
+    "lifecycle": "blocking",
+    "duration": 26,
+    "startTime": "2025-07-26 05:42:26.553886 UTC",
+    "endTime": "2025-07-26 05:42:26.580057 UTC",
+    "result": "passed",
+    "output": "[INFO] [env] Using kubeconfig: /Users/camilam/.kube/config[WARN] Skipping feature capability check: not OpenShift  STEP: verifying CRD clusterextensions.olm.operatorframework.io @ 07/26/25 06:42:26.57\n  STEP: verifying CRD clustercatalogs.olm.operatorframework.io @ 07/26/25 06:42:26.575\n"
+  },
+  {
+    "name": "[sig-olmv1] OLMv1 should pass a trivial sanity check",
+    "lifecycle": "blocking",
+    "duration": 26,
+    "startTime": "2025-07-26 05:42:26.553852 UTC",
+    "endTime": "2025-07-26 05:42:26.580263 UTC",
+    "result": "passed",
+    "output": ""
+  }
+]
+```
+
+## Writing Tests
+
+You can write tests in the `openshift/tests-extension/tests/` directory. 
+Please follow these guidelines:
+
+1. Skip OpenShift-specific logic on vanilla Kubernetes
+
+If your test requires OpenShift-only APIs (e.g., clusterversions.config.openshift.io), 
+guard it using `env.Get().IsOpenShift` to ensure it skips gracefully when running 
+on vanilla Kubernetes clusters:
+
+```go
+    if !env.Get().IsOpenShift {
+        extlogs.Warn("Skipping test: not running on OpenShift")
+        Skip("This test requires OpenShift APIs")
+    }
+```
+
+Or, if used within helper functions:
+```go
+    if !env.Get().IsOpenShift {
+        extlogs.Warn("Skipping feature capability check: not OpenShift")
+        return
+    }
+```
+
+This ensures compatibility when running tests in non-OpenShift environments such as KinD.
+
 ## Development Workflow
 
 - Add or update tests in: `openshift/tests-extension/tests/`

openshift/tests-extension/cmd/main.go

@@ -21,6 +21,7 @@ import (
 
 	// The import below is necessary to ensure that the OLMv1 tests are registered with the extension.
 	_ "github/operator-framework-operator-controller/openshift/tests-extension/test"
+	"github/operator-framework-operator-controller/openshift/tests-extension/test/env"
 )
 
 func main() {
@@ -137,21 +138,10 @@ func main() {
 	// Add more removed test names below
 	)
 
-	// TODO: Init test framework for cluster-aware cases
-	// --------------------------------------------------
-	// The external binary doesn't currently init the test framework (e.g., kubeconfig, REST client).
-	// That's fine for now since our tests don't access the cluster.
-	// However, any test that does will fail when run with this binary.
-	//
-	// openshift-tests handles this via:
-	// - SuiteWithKubeTestInitializationPreSuite()
-	//   -> calls DecodeProvider() and InitializeTestFramework()
-	//
-	// We'll need to add similar logic when we start add the tests here.
-	//
-	// References:
-	// - https://github.com/openshift/origin/blob/main/pkg/cmd/openshift-tests/run/flags.go#L53
-	// - https://github.com/openshift/origin/blob/main/pkg/clioptions/clusterdiscovery/provider.go#L100
+	// Initialize the environment before running any tests.
+	specs.AddBeforeAll(func() {
+		env.Init()
+	})
 
 	ext.AddSpecs(specs)
 	registry.Register(ext)

openshift/tests-extension/go.mod

@@ -3,32 +3,69 @@ module github/operator-framework-operator-controller/openshift/tests-extension
 go 1.24.3
 
 require (
-	github.com/onsi/ginkgo/v2 v2.21.0
-	github.com/onsi/gomega v1.35.1
+	github.com/onsi/ginkgo/v2 v2.22.0
+	github.com/onsi/gomega v1.36.1
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20250722101414-8083129ab8f9
+	github.com/openshift/api v0.0.0-20250718204806-3333746edfbf
+	github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
 	github.com/spf13/cobra v1.8.1
+	k8s.io/apiextensions-apiserver v0.33.2
+	k8s.io/apimachinery v0.33.3
+	k8s.io/client-go v0.33.2
+	sigs.k8s.io/controller-runtime v0.21.0
 )
 
 require (
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
+	cel.dev/expr v0.19.1 // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
+	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/google/cel-go v0.17.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/cel-go v0.23.2 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	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/pkg/errors v0.9.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stoewer/go-strcase v1.2.0 // indirect
-	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	github.com/stoewer/go-strcase v1.3.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/term v0.30.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
-	google.golang.org/protobuf v1.35.1 // 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/protobuf v1.36.5 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.33.2 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 // This replace replace is required for we use the OCP fork of Ginkgo.