updating machinepool test skip

Author: Fiona-Waters

test/e2e/instascale_machinepool_test.go

@@ -29,8 +29,9 @@ func TestInstascaleMachinePool(t *testing.T) {
 	test := With(t)
 	test.T().Parallel()
 
-	if !IsOsd() {
-		test.T().Skip("Skipping test as not running on an OSD cluster")
+	clusterType := GetClusterType(test)
+	if clusterType != OsdCluster {
+		test.T().Skipf("Skipping test as not running on an OSD cluster, resolved cluster type: %s", clusterType)
 	}
 
 	namespace := test.NewTestNamespace()

test/support/environment.go

@@ -96,14 +96,6 @@ func GetClusterType(t Test) ClusterType {
 	}
 }
 
-func IsOsd() bool {
-	osdClusterId, found := GetOsdClusterId()
-	if found && osdClusterId != "" {
-		return true
-	}
-	return false
-}
-
 func lookupEnvOrDefault(key, value string) string {
 	if v, ok := os.LookupEnv(key); ok {
 		return v