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

@@ -21,6 +21,7 @@ import (
 	"math/rand"
 	"strconv"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
@@ -78,14 +79,13 @@ func TestE2E(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	var err error
-	tcc := make(chan *remote.TestContext)
-	hdtcc := make(chan *remote.TestContext)
+	numberOfInstancesPerZone := 2
+	zones := strings.Split(*zones, ",")
+	tcc := make(chan *remote.TestContext, len(zones)*numberOfInstancesPerZone)
+	hdtcc := make(chan *remote.TestContext, len(zones))
 	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
-
 	rand.Seed(time.Now().UnixNano())
 
 	computeService, err = remote.GetComputeClient()
@@ -110,29 +110,37 @@ var _ = BeforeSuite(func() {
 
 	klog.Infof("Running in project %v with service account %v", *project, *serviceAccount)
 
-	numberOfInstancesPerZone := 2
-
-	setupContext := func(zones []string, randInt int) {
-		for _, zone := range zones {
-			go func(curZone string) {
+	setupContext := func(zone string) {
+		var wg sync.WaitGroup
+		// Create 2 instances for each zone as we need 2 instances each zone for certain test cases
+		for j := 0; j < numberOfInstancesPerZone; j++ {
+			wg.Add(1)
+			go func(curZone string, randInt int) {
 				defer GinkgoRecover()
+				defer wg.Done()
 				tcc <- NewDefaultTestContext(curZone, strconv.Itoa(randInt))
-			}(zone)
-			go func(curZone string) {
-				defer GinkgoRecover()
-				hdtcc <- NewTestContext(curZone, *hdMinCpuPlatform, *hdMachineType, strconv.Itoa(randInt))
-			}(zone)
+			}(zone, j)
 		}
+		go func(curZone string) {
+			wg.Add(1)
+			defer GinkgoRecover()
+			defer wg.Done()
+			hdtcc <- NewTestContext(curZone, *hdMinCpuPlatform, *hdMachineType, "0")
+		}(zone)
+		wg.Wait()
 	}
-	for j := 0; j < numberOfInstancesPerZone; j++ {
-		setupContext(zones, j)
+
+	for _, zone := range zones {
+		setupContext(zone)
 	}
 
 	for i := 0; i < len(zones)*numberOfInstancesPerZone; i++ {
 		tc := <-tcc
 		testContexts = append(testContexts, tc)
 		klog.Infof("Added TestContext for node %s", tc.Instance.GetName())
-		tc = <-hdtcc
+	}
+	for i := 0; i < len(zones); i++ {
+		tc := <-hdtcc
 		hyperdiskTestContexts = append(hyperdiskTestContexts, tc)
 		klog.Infof("Added TestContext for node %s", tc.Instance.GetName())
 	}
@@ -188,6 +196,11 @@ func NewTestContext(zone, minCpuPlatform, machineType string, instanceNumber str
 		ComputeService:            computeService,
 		LocalSSDCount:             localSSDCount,
 	}
+
+	if machineType == *hdMachineType {
+		// Machine type is defaulted to c3-standard-2 which doesn't support LSSD and we don't need LSSD for HdHA test context
+		instanceConfig.LocalSSDCount = 0
+	}
 	i, err := remote.SetupInstance(instanceConfig)
 	if err != nil {
 		klog.Fatalf("Failed to setup instance %v: %v", nodeID, err)

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",