Use enum for cluster type in e2e tests

Author: sutaakar

test/e2e/instascale_machineset_test.go

@@ -14,9 +14,9 @@ func TestInstascaleMachineSet(t *testing.T) {
 	test.T().Parallel()
 
 	// skip test if not using machine sets
-	clusterType := DetermineClusterType()
+	clusterType := GetClusterType(test)
 	if clusterType != OcpCluster {
-		test.T().Skip("Skipping test as not running on an OCP cluster")
+		test.T().Skipf("Skipping test as not running on an OCP cluster, resolved cluster type: %s", clusterType)
 	}
 
 	namespace := test.NewTestNamespace()

test/support/environment.go

@@ -40,13 +40,16 @@ const (
 	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"
+	ClusterTypeEnvVar = "CLUSTER_TYPE"
+)
+
+type ClusterType string
+
+const (
+	OsdCluster        ClusterType = "OSD"
+	OcpCluster        ClusterType = "OCP"
+	HypershiftCluster ClusterType = "HYPERSHIFT"
+	UndefinedCluster  ClusterType = "UNDEFINED"
 )
 
 func GetCodeFlareSDKVersion() string {
@@ -74,8 +77,23 @@ func GetOsdClusterId() (string, bool) {
 	return os.LookupEnv(OsdClusterID)
 }
 
-func GetClusterType() (string, bool) {
-	return os.LookupEnv(ClusterType)
+func GetClusterType(t Test) ClusterType {
+	clusterType, ok := os.LookupEnv(ClusterTypeEnvVar)
+	if !ok {
+		t.T().Logf("Expected environment variable %s not found, cluster type is not defined.", ClusterTypeEnvVar)
+		return UndefinedCluster
+	}
+	switch clusterType {
+	case "OSD":
+		return OsdCluster
+	case "OCP":
+		return OcpCluster
+	case "HYPERSHIFT":
+		return HypershiftCluster
+	default:
+		t.T().Logf("Expected environment variable %s contains unexpected value: '%s'", ClusterTypeEnvVar, clusterType)
+		return UndefinedCluster
+	}
 }
 
 func IsOsd() bool {
@@ -92,20 +110,3 @@ 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 ""
-	}
-}