UPSTREAM: <carry>: add support for qe cases

Author: kuiwang02

openshift/tests-extension/Makefile

@@ -80,6 +80,14 @@ pkg/bindata/catalog/catalog.go: $(shell find testdata/catalog -type f)
 	$(GO_BINDATA) -pkg catalog -o $@ -prefix "testdata/catalog" testdata/catalog/...
 	go fmt ./$(@D)/...
 
+bindata: test/extended/testdata/bindata.go
+test/extended/testdata/bindata.go: $(shell find test/extended/testdata -type f ! -name 'bindata.go')
+	mkdir -p $(@D)
+	$(GO_BINDATA) -nocompress -nometadata \
+		-pkg testdata -o $@ -prefix "testextended" \
+		-ignore "test/extended/testdata/bindata.go" test/extended/testdata/...
+	gofmt -s -w $@
+
 # GO_COMPLIANCE_POLICY="exempt_all" must only be used for test related binaries.
 # It prevents various FIPS compliance policies from being applied to this compilation.
 # Do not set globally.

openshift/tests-extension/cmd/main.go

@@ -17,10 +17,12 @@ import (
 	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"
+	exutil "github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/test/extended/util"
 	"github.com/spf13/cobra"
 
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
-	_ "github/operator-framework-operator-controller/openshift/tests-extension/test"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
+	_ "github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/test"
+	_ "github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/test/extended/olmv1qe"
 )
 
 func main() {
@@ -140,6 +142,7 @@ func main() {
 	// Initialize the environment before running any tests.
 	specs.AddBeforeAll(func() {
 		env.Init()
+		exutil.InitCLusterEnv()
 	})
 
 	ext.AddSpecs(specs)

openshift/tests-extension/pkg/env/cluster.go

@@ -24,7 +24,7 @@ import (
 
 	olmv1 "github.com/operator-framework/operator-controller/api/v1"
 
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/extlogs"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/extlogs"
 )
 
 // TestEnv holds the test environment state, including the Kubernetes REST config,
@@ -102,7 +102,7 @@ func initTestEnv() *TestEnv {
 
 	version := ""
 	if isOcp {
-		extlogs.Infof("[env] Cluster environment initialized (OpenShift: %t)", isOcp)
+		extlogs.Infof("[env] Cluster environment initialized (OpenShift: %t)\n", isOcp)
 		version = getOcpVersion(k8sClient)
 	}
 
@@ -138,10 +138,10 @@ func getRestConfig() *rest.Config {
 		if err != nil {
 			log.Fatalf("Failed to load kubeconfig from %s: %v", kubeconfig, err)
 		}
-		extlogs.Infof("[env] Using kubeconfig: %s", kubeconfig)
+		extlogs.Infof("[env] Using kubeconfig: %s\n", kubeconfig)
 		return configureQPS(cfg)
 	}
-	extlogs.Infof("[env] Using in-cluster configuration: %s", kubeconfig)
+	extlogs.Infof("[env] Using in-cluster configuration: %s\n", kubeconfig)
 	cfg, err := rest.InClusterConfig()
 	if err != nil {
 		log.Fatalf("Failed to load in-cluster config: %v", err)

openshift/tests-extension/pkg/helpers/catalogs.go

@@ -14,7 +14,7 @@ import (
 
 	olmv1 "github.com/operator-framework/operator-controller/api/v1"
 
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
 )
 
 // NewClusterCatalog returns a new ClusterCatalog object.

openshift/tests-extension/pkg/helpers/cluster_catalog.go

@@ -16,7 +16,7 @@ import (
 
 	olmv1 "github.com/operator-framework/operator-controller/api/v1"
 
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
 )
 
 // CreateClusterCatalog creates a ClusterCatalog with the specified name and image reference

openshift/tests-extension/pkg/helpers/cluster_extension.go

@@ -21,7 +21,7 @@ import (
 
 	olmv1 "github.com/operator-framework/operator-controller/api/v1"
 
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
 )
 
 // CreateClusterExtension creates a ServiceAccount, ClusterRoleBinding, and ClusterExtension using typed APIs.

openshift/tests-extension/pkg/helpers/feature_capability.go

@@ -12,8 +12,8 @@ import (
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
-	"github/operator-framework-operator-controller/openshift/tests-extension/pkg/extlogs"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/env"
+	"github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/extlogs"
 )
 
 // RequireOLMv1CapabilityOnOpenshift checks if the OpenShift cluster has

openshift/tests-extension/test/extended/extended.go

@@ -0,0 +1,4 @@
+package extended
+
+// This file exists to make test/extended a valid Go package.
+// The actual test cases are in the olmv1qe subdirectory.