fixing PR checks

Author: Fiona-Waters

test/e2e/instascale.go

@@ -2,13 +2,16 @@ package e2e
 
 import (
 	. "github.com/onsi/gomega"
-	ocmsdk "github.com/openshift-online/ocm-sdk-go"
-	. "github.com/project-codeflare/codeflare-operator/test/support"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
+
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	ocmsdk "github.com/openshift-online/ocm-sdk-go"
+
+	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
 func TestConfig(test Test, namespace string) (*corev1.ConfigMap, error) {

test/e2e/instascale_machinepool_test.go

@@ -6,8 +6,10 @@ import (
 
 	. "github.com/onsi/gomega"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
+
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
+
 	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 

test/support/clusterpools.go

@@ -8,19 +8,11 @@ import (
 
 	ocmsdk "github.com/openshift-online/ocm-sdk-go"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
-	mapiclientset "github.com/openshift/client-go/machine/clientset/versioned"
-	"github.com/openshift/client-go/machine/listers/machine/v1beta1"
 )
 
 var (
-	ClusterID     string = os.Getenv("CLUSTERID")
-	machineClient mapiclientset.Interface
-	msLister      v1beta1.MachineSetLister
-	TestName      string = "test-instascale"
-)
-
-const (
-	namespaceToList = "openshift-machine-api"
+	ClusterID string = os.Getenv("CLUSTERID")
+	TestName  string = "test-instascale"
 )
 
 func CreateOCMConnection(secret string) (*ocmsdk.Connection, error) {