Test contexts are now initialized once on startup instead of per-test

Author: davidz627

test/e2e/tests/multi_zone_e2e_test.go

@@ -31,18 +31,11 @@ import (
 
 var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
 	BeforeEach(func() {
-		Expect(len(testInstances)).To(BeNumerically(">", 1))
+		Expect(len(testContexts)).To(BeNumerically(">", 1))
 	})
 
 	It("Should get reasonable topology from nodes with NodeGetInfo", func() {
-		for _, instance := range testInstances {
-			testContext, err := testutils.GCEClientAndDriverSetup(instance)
-			Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")
-			defer func() {
-				err := remote.TeardownDriverAndClient(testContext)
-				Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
-			}()
-
+		for _, testContext := range testContexts {
 			resp, err := testContext.Client.NodeGetInfo()
 			Expect(err).To(BeNil())
 
@@ -65,24 +58,17 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
 	It("Should successfully run through entire lifecycle of an RePD volume on instances in 2 zones", func() {
 		// Create new driver and client
 
-		Expect(testInstances).NotTo(BeEmpty())
+		Expect(testContexts).NotTo(BeEmpty())
 
 		zoneToContext := map[string]*remote.TestContext{}
 		zones := []string{}
 
-		for _, i := range testInstances {
-			_, z, _ := i.GetIdentity()
+		for _, tc := range testContexts {
+			_, z, _ := tc.Instance.GetIdentity()
 			// Zone hasn't been seen before
 			if _, ok := zoneToContext[z]; !ok {
-				c, err := testutils.GCEClientAndDriverSetup(i)
-				Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")
-				zoneToContext[z] = c
+				zoneToContext[z] = tc
 				zones = append(zones, z)
-
-				defer func() {
-					err := remote.TeardownDriverAndClient(c)
-					Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
-				}()
 			}
 			if len(zoneToContext) == 2 {
 				break

test/e2e/tests/setup_e2e_test.go

@@ -35,7 +35,7 @@ var (
 	runInProw       = flag.Bool("run-in-prow", false, "If true, use a Boskos loaned project and special CI service accounts and ssh keys")
 	deleteInstances = flag.Bool("delete-instances", false, "Delete the instances after tests run")
 
-	testInstances      = []*remote.InstanceInfo{}
+	testContexts       = []*remote.TestContext{}
 	computeService     *compute.Service
 	betaComputeService *computebeta.Service
 )
@@ -73,22 +73,28 @@ var _ = BeforeSuite(func() {
 		i, err := remote.SetupInstance(*project, zone, nodeID, *serviceAccount, computeService)
 		Expect(err).To(BeNil())
 
-		testInstances = append(testInstances, i)
-	}
+		// Create new driver and client
+		testContext, err := testutils.GCEClientAndDriverSetup(i)
+		Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")
+
+		testContexts = append(testContexts, testContext)
 
+	}
 })
 
 var _ = AfterSuite(func() {
-	/*
-		err := node.client.CloseConn()
-		if err != nil {
-			Logf("Failed to close the client")
-		} else {
-			Logf("Closed the client")
-	*/
-	for _, i := range testInstances {
+
+	for _, tc := range testContexts {
+		err := remote.TeardownDriverAndClient(tc)
+		Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
 		if *deleteInstances {
-			i.DeleteInstance()
+			tc.Instance.DeleteInstance()
 		}
 	}
 })
+
+func getRandomTestContext() *remote.TestContext {
+	Expect(testContexts).ToNot(BeEmpty())
+	rn := rand.Intn(len(testContexts))
+	return testContexts[rn]
+}

test/e2e/tests/single_zone_e2e_test.go

@@ -21,8 +21,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
-	testutils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e/utils"
-	remote "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/remote"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	. "github.com/onsi/ginkgo"
@@ -41,14 +39,7 @@ const (
 var _ = Describe("GCE PD CSI Driver", func() {
 
 	It("Should create->attach->stage->mount volume and check if it is writable, then unmount->unstage->detach->delete and check disk is deleted", func() {
-		// Create new driver and client
-		Expect(testInstances).NotTo(BeEmpty())
-		testContext, err := testutils.GCEClientAndDriverSetup(testInstances[0])
-		Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")
-		defer func() {
-			err := remote.TeardownDriverAndClient(testContext)
-			Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
-		}()
+		testContext := getRandomTestContext()
 
 		p, z, _ := testContext.Instance.GetIdentity()
 		client := testContext.Client
@@ -90,14 +81,8 @@ var _ = Describe("GCE PD CSI Driver", func() {
 	})
 
 	It("Should create disks in correct zones when topology is specified", func() {
-		///
-		Expect(testInstances).NotTo(BeEmpty())
-		testContext, err := testutils.GCEClientAndDriverSetup(testInstances[0])
-		Expect(err).To(BeNil(), "Failed to set up new driver and client")
-		defer func() {
-			err := remote.TeardownDriverAndClient(testContext)
-			Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
-		}()
+		Expect(testContexts).ToNot(BeEmpty())
+		testContext := getRandomTestContext()
 
 		p, _, _ := testContext.Instance.GetIdentity()
 
@@ -126,14 +111,8 @@ var _ = Describe("GCE PD CSI Driver", func() {
 	})
 
 	It("Should successfully create RePD in two zones in the drivers region when none are specified", func() {
-		// Create new driver and client
-		Expect(testInstances).NotTo(BeEmpty())
-		testContext, err := testutils.GCEClientAndDriverSetup(testInstances[0])
-		Expect(err).To(BeNil(), "Failed to set up new driver and client")
-		defer func() {
-			err := remote.TeardownDriverAndClient(testContext)
-			Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
-		}()
+		Expect(testContexts).ToNot(BeEmpty())
+		testContext := getRandomTestContext()
 
 		controllerInstance := testContext.Instance
 		controllerClient := testContext.Client
@@ -177,14 +156,8 @@ var _ = Describe("GCE PD CSI Driver", func() {
 	})
 
 	It("Should create and delete disk with default zone", func() {
-		// Create new driver and client
-		Expect(testInstances).NotTo(BeEmpty())
-		testContext, err := testutils.GCEClientAndDriverSetup(testInstances[0])
-		Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")
-		defer func() {
-			err := remote.TeardownDriverAndClient(testContext)
-			Expect(err).To(BeNil(), "Teardown Driver and Client failed with error")
-		}()
+		Expect(testContexts).ToNot(BeEmpty())
+		testContext := getRandomTestContext()
 
 		p, z, _ := testContext.Instance.GetIdentity()
 		client := testContext.Client

test/remote/instance.go

@@ -88,8 +88,7 @@ func (i *InstanceInfo) CreateOrGetInstance(serviceAccount string) error {
 		return fmt.Errorf("Failed to create firewall rule: %v", err)
 	}
 
-	// TODO(#97): Pick a better boot disk image
-	imageURL := "projects/ml-images/global/images/family/tf-1-9"
+	imageURL := "projects/ubuntu-os-cloud/global/images/family/ubuntu-minimal-1804-lts"
 	inst := &compute.Instance{
 		Name:        i.name,
 		MachineType: machineType(i.zone, ""),