determining cluster type

Author: Fiona-Waters

test/e2e/instascale_machineset_test.go

@@ -6,8 +6,6 @@ import (
 	. "github.com/onsi/gomega"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
-	"k8s.io/apimachinery/pkg/api/errors"
-
 	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
@@ -16,9 +14,9 @@ func TestInstascaleMachineSet(t *testing.T) {
 	test.T().Parallel()
 
 	// skip test if not using machine sets
-	ms, err := MachineSetsExist(test)
-	if !ms || err != nil && errors.IsNotFound(err) {
-		test.T().Skip("Skipping test as machine sets don't exist")
+	clusterType := DetermineClusterType()
+	if clusterType != OcpCluster {
+		test.T().Skip("Skipping test as not running on an OCP cluster")
 	}
 
 	namespace := test.NewTestNamespace()

test/support/environment.go

@@ -38,6 +38,15 @@ const (
 
 	// Cluster ID for OSD cluster used in tests, used for testing InstaScale
 	OsdClusterID = "CLUSTERID"
+
+	// Type of cluster test is run on
+	ClusterType = "CLUSTER_TYPE"
+	// OpenShift Dedicated Cluster
+	OsdCluster = "OSD"
+	// OpenShift Container Platform Cluster
+	OcpCluster = "OCP"
+	// ROSA Hosted Hypershift Cluster
+	HypershiftCluster = "HYPERSHIFT"
 )
 
 func GetCodeFlareSDKVersion() string {
@@ -65,6 +74,10 @@ func GetOsdClusterId() (string, bool) {
 	return os.LookupEnv(OsdClusterID)
 }
 
+func GetClusterType() (string, bool) {
+	return os.LookupEnv(ClusterType)
+}
+
 func IsOsd() bool {
 	osdClusterId, found := GetOsdClusterId()
 	if found && osdClusterId != "" {
@@ -79,3 +92,20 @@ func lookupEnvOrDefault(key, value string) string {
 	}
 	return value
 }
+
+func DetermineClusterType() string {
+	clusterType, ok := GetClusterType()
+	if !ok {
+		return ""
+	}
+	switch clusterType {
+	case "OSD":
+		return OsdCluster
+	case "OCP":
+		return OcpCluster
+	case "HYPERSHIFT":
+		return HypershiftCluster
+	default:
+		return ""
+	}
+}