fix test suite issue

Author: Sneha-at

cmd/gce-pd-csi-driver/main.go

@@ -352,7 +352,7 @@ func urlFlag(target **url.URL, name string, usage string) {
 }
 
 func setupDataCache(ctx context.Context, nodeName string) error {
-	klog.V(2).Infof("Seting up data cache for node %s", nodeName)
+	klog.V(2).Infof("Setting up data cache for node %s", nodeName)
 	if nodeName != common.TestNode {
 		cfg, err := rest.InClusterConfig()
 		if err != nil {

test/e2e/tests/setup_e2e_test.go

@@ -50,15 +50,12 @@ var (
 	cloudtopHost              = flag.Bool("cloudtop-host", false, "The local host is cloudtop, a kind of googler machine with special requirements to access GCP")
 	extraDriverFlags          = flag.String("extra-driver-flags", "", "Extra flags to pass to the driver")
 	enableConfidentialCompute = flag.Bool("enable-confidential-compute", false, "Create VMs with confidential compute mode. This uses NVMe devices")
-	hdMachineType             = flag.String("hyperdisk-machine-type", "c3-standard-4", "Type of machine to provision instance on")
-	hdMinCpuPlatform          = flag.String("hyperdisk-min-cpu-platform", "sapphirerapids", "Minimum CPU architecture")
-
-	testContexts          = []*remote.TestContext{}
-	hyperdiskTestContexts = []*remote.TestContext{}
-	computeService        *compute.Service
-	computeAlphaService   *computealpha.Service
-	computeBetaService    *computebeta.Service
-	kmsClient             *cloudkms.KeyManagementClient
+
+	testContexts        = []*remote.TestContext{}
+	computeService      *compute.Service
+	computeAlphaService *computealpha.Service
+	computeBetaService  *computebeta.Service
+	kmsClient           *cloudkms.KeyManagementClient
 )
 
 const localSSDCount int64 = 2
@@ -76,9 +73,7 @@ func TestE2E(t *testing.T) {
 var _ = BeforeSuite(func() {
 	var err error
 	tcc := make(chan *remote.TestContext)
-	hdtcc := make(chan *remote.TestContext)
 	defer close(tcc)
-	defer close(hdtcc)
 
 	zones := strings.Split(*zones, ",")
 	// Create 2 instances for each zone as we need 2 instances each zone for certain test cases
@@ -113,11 +108,7 @@ var _ = BeforeSuite(func() {
 		for _, zone := range zones {
 			go func(curZone string) {
 				defer GinkgoRecover()
-				tcc <- NewDefaultTestContext(curZone, strconv.Itoa(randInt))
-			}(zone)
-			go func(curZone string) {
-				defer GinkgoRecover()
-				hdtcc <- NewTestContext(curZone, *hdMinCpuPlatform, *hdMachineType, strconv.Itoa(randInt))
+				tcc <- NewTestContext(curZone, strconv.Itoa(randInt))
 			}(zone)
 		}
 	}
@@ -129,9 +120,6 @@ var _ = BeforeSuite(func() {
 		tc := <-tcc
 		testContexts = append(testContexts, tc)
 		klog.Infof("Added TestContext for node %s", tc.Instance.GetName())
-		tc = <-hdtcc
-		hyperdiskTestContexts = append(hyperdiskTestContexts, tc)
-		klog.Infof("Added TestContext for node %s", tc.Instance.GetName())
 	}
 })
 
@@ -156,21 +144,17 @@ func getDriverConfig() testutils.DriverConfig {
 	}
 }
 
-func NewDefaultTestContext(zone string, instanceNumber string) *remote.TestContext {
-	return NewTestContext(zone, *minCpuPlatform, *machineType, instanceNumber)
-}
-
-func NewTestContext(zone, minCpuPlatform, machineType string, instanceNumber string) *remote.TestContext {
-	nodeID := fmt.Sprintf("%s-%s-%s-%s", *vmNamePrefix, zone, machineType, instanceNumber)
+func NewTestContext(zone string, instanceNumber string) *remote.TestContext {
+	nodeID := fmt.Sprintf("%s-%s-%s", *vmNamePrefix, zone, instanceNumber)
 	klog.Infof("Setting up node %s", nodeID)
 
 	instanceConfig := remote.InstanceConfig{
 		Project:                   *project,
 		Architecture:              *architecture,
-		MinCpuPlatform:            minCpuPlatform,
+		MinCpuPlatform:            *minCpuPlatform,
 		Zone:                      zone,
 		Name:                      nodeID,
-		MachineType:               machineType,
+		MachineType:               *machineType,
 		ServiceAccount:            *serviceAccount,
 		ImageURL:                  *imageURL,
 		CloudtopHost:              *cloudtopHost,
@@ -200,12 +184,12 @@ func NewTestContext(zone, minCpuPlatform, machineType string, instanceNumber str
 	pkgs := []string{"lvm2", "mdadm", "grep", "coreutils"}
 	err = testutils.InstallDependencies(i, pkgs)
 	if err != nil {
-		klog.Fatalf("Failed to install dependency package on node %v: error : %v", i.GetNodeID(), err)
+		klog.Errorf("Failed to install dependency package on node %v: error : %v", i.GetNodeID(), err)
 	}
 
 	err = testutils.SetupDataCachingConfig(i)
 	if err != nil {
-		klog.Fatalf("Failed to setup data cache required config error %v", err)
+		klog.Errorf("Failed to setup data cache required config error %v", err)
 	}
 	klog.Infof("Creating new driver and client for node %s", i.GetName())
 	tc, err := testutils.GCEClientAndDriverSetup(i, getDriverConfig())

test/e2e/utils/utils.go

@@ -83,6 +83,7 @@ func GCEClientAndDriverSetup(instance *remote.InstanceInfo, driverConfig DriverC
 	// useful to see what's happening when debugging tests.
 	driverRunCmd := fmt.Sprintf("sh -c '/usr/bin/nohup %s/gce-pd-csi-driver -v=6 --endpoint=%s %s 2> %s/prog.out < /dev/null > /dev/null &'",
 		workspace, endpoint, strings.Join(extra_flags, " "), workspace)
+	klog.Infof("driverCmd %s", driverRunCmd)
 	config := &remote.ClientConfig{
 		PkgPath:      pkgPath,
 		BinPath:      binPath,

test/remote/instance.go

@@ -148,7 +148,6 @@ func (i *InstanceInfo) CreateOrGetInstance(localSSDCount int) error {
 			EnableConfidentialCompute: true,
 		}
 	}
-	klog.Infof("=======Adding LocalSSD %v=============", localSSDCount)
 
 	localSSDConfig := &compute.AttachedDisk{
 		Type: "SCRATCH",

test/run-e2e.sh

@@ -5,9 +5,9 @@ set -x
 
 readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
-TIMEOUT=50m
+TIMEOUT=20m
 if [ "$RUN_CONTROLLER_MODIFY_VOLUME_TESTS" = true ]; then
     TIMEOUT=45m
 fi
 
-go test --timeout "${TIMEOUT}" --v "${PKGDIR}/test/e2e/tests" --run-in-prow=true --delete-instances=true --logtostderr $@
+go test --timeout "${TIMEOUT}" --v "${PKGDIR}/test/e2e/tests" --run-in-prow=true --delete-instances=false --logtostderr $@