Fixing rebasing issues.

Author: sjswerdlow

Diff for: test/e2e/tests/setup_e2e_test.go

@@ -36,33 +36,32 @@ import (
 )
 
 var (
-	project          = flag.String("project", "", "Project to run tests in")
-	serviceAccount   = flag.String("service-account", "", "Service account to bring up instance with")
-	vmNamePrefix     = flag.String("vm-name-prefix", "gce-pd-csi-e2e", "VM name prefix")
-	architecture     = flag.String("arch", "amd64", "Architecture pd csi driver build on")
-	minCpuPlatform   = flag.String("min-cpu-platform", "rome", "Minimum CPU architecture")
-	mwMinCpuPlatform = flag.String("min-cpu-platform-mw", "sapphirerapids", "Minimum CPU architecture for multiwriter tests")
-	zones            = flag.String("zones", "us-east4-a,us-east4-c", "Zones to run tests in. If there are multiple zones, separate each by comma")
-	machineType      = flag.String("machine-type", "n2d-standard-4", "Type of machine to provision instance on")
-	// Multi-writer is only supported on M3, C3, and N4
-	// https://cloud.google.com/compute/docs/disks/sharing-disks-between-vms#hd-multi-writer
-	mwMachineType             = flag.String("mw-machine-type", "c3-standard-4", "Type of machine to provision instance for multiwriter tests")
+	project                   = flag.String("project", "", "Project to run tests in")
+	serviceAccount            = flag.String("service-account", "", "Service account to bring up instance with")
+	vmNamePrefix              = flag.String("vm-name-prefix", "gce-pd-csi-e2e", "VM name prefix")
+	architecture              = flag.String("arch", "amd64", "Architecture pd csi driver build on")
+	minCpuPlatform            = flag.String("min-cpu-platform", "rome", "Minimum CPU architecture")
+	mwMinCpuPlatform          = flag.String("min-cpu-platform-mw", "sapphirerapids", "Minimum CPU architecture for multiwriter tests")
+	zones                     = flag.String("zones", "us-east4-a,us-east4-c", "Zones to run tests in. If there are multiple zones, separate each by comma")
+	machineType               = flag.String("machine-type", "n2d-standard-4", "Type of machine to provision instance on")
 	imageURL                  = flag.String("image-url", "projects/ubuntu-os-cloud/global/images/family/ubuntu-minimal-2404-lts-amd64", "OS image url to get image from")
 	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")
 	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")
+	// Multi-writer is only supported on M3, C3, and N4
+	// https://cloud.google.com/compute/docs/disks/sharing-disks-between-vms#hd-multi-writer
+	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{}
+	testContexts            = []*remote.TestContext{}
+	hyperdiskTestContexts   = []*remote.TestContext{}
 	multiWriterTestContexts = []*remote.TestContext{}
-	computeService        *compute.Service
-	computeAlphaService   *computealpha.Service
-	computeBetaService    *computebeta.Service
-	kmsClient             *cloudkms.KeyManagementClient
+	computeService          *compute.Service
+	computeAlphaService     *computealpha.Service
+	computeBetaService      *computebeta.Service
+	kmsClient               *cloudkms.KeyManagementClient
 )
 
 func init() {
@@ -122,15 +121,14 @@ var _ = BeforeSuite(func() {
 			hdtcc <- NewTestContext(curZone, *hdMinCpuPlatform, *hdMachineType)
 		}(zone)
 		go func(curZone string) {
+			defer GinkgoRecover()
 			mwTcc <- NewTestContext(curZone, *mwMinCpuPlatform, *mwMachineType)
 		}(zone)
 	}
 
 	for i := 0; i < len(zones); i++ {
 		tc := <-tcc
 		testContexts = append(testContexts, tc)
-		mwTc := <-mwTcc
-		multiWriterTestContexts = append(multiWriterTestContexts, mwTc)
 		klog.Infof("Added TestContext for node %s", tc.Instance.GetName())
 		tc = <-hdtcc
 		hyperdiskTestContexts = append(hyperdiskTestContexts, tc)
@@ -146,7 +144,7 @@ var _ = AfterSuite(func() {
 			tc.Instance.DeleteInstance()
 		}
 	}
-	for _, mwTc := range multiWriterTestContexts {
+	for _, mwTc := range hyperdiskTestContexts {
 		err := remote.TeardownDriverAndClient(mwTc)
 		Expect(err).To(BeNil(), "Multiwriter Teardown Driver and Client failed with error")
 		if *deleteInstances {
@@ -223,7 +221,7 @@ func getRandomTestContext() *remote.TestContext {
 	return testContexts[rn]
 }
 func getRandomMwTestContext() *remote.TestContext {
-	Expect(multiWriterTestContexts).ToNot(BeEmpty())
-	rn := rand.Intn(len(multiWriterTestContexts))
-	return multiWriterTestContexts[rn]
+	Expect(hyperdiskTestContexts).ToNot(BeEmpty())
+	rn := rand.Intn(len(hyperdiskTestContexts))
+	return hyperdiskTestContexts[rn]
 }

Diff for: test/e2e/tests/single_zone_e2e_test.go

@@ -283,7 +283,6 @@ var _ = Describe("GCE PD CSI Driver", func() {
 			Expect(err).To(BeNil(), "Could not find disk in correct zone")
 		}
 	})
-
 	// TODO(hime): Enable this test once all release branches contain the fix from PR#1708.
 	// It("Should return InvalidArgument when disk size exceeds limit", func() {
 	// 	// If this returns a different error code (like Unknown), the error wrapping logic in #1708 has regressed.