Merge pull request #215 from davidz627/fix/e2eTestTimeout

Bump E2E go test timeout to 20m

Author: k8s-ci-robot

test/e2e/tests/multi_zone_e2e_test.go

@@ -19,6 +19,7 @@ import (
 	"strings"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/golang/glog"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -145,7 +146,7 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
 func testAttachWriteReadDetach(volID string, volName string, instance *remote.InstanceInfo, client *remote.CsiClient, readOnly bool) {
 	var err error
 
-	Logf("Starting testAttachWriteReadDetach with volume %v node %v with readonly %v\n", volID, instance.GetNodeID(), readOnly)
+	glog.Infof("Starting testAttachWriteReadDetach with volume %v node %v with readonly %v\n", volID, instance.GetNodeID(), readOnly)
 	// Attach Disk
 	err = client.ControllerPublishVolume(volID, instance.GetNodeID())
 	Expect(err).To(BeNil(), "ControllerPublishVolume failed with error for disk %v on node %v", volID, instance.GetNodeID())
@@ -205,5 +206,5 @@ func testAttachWriteReadDetach(volID string, volName string, instance *remote.In
 	err = client.NodeUnpublishVolume(volID, secondPublishDir)
 	Expect(err).To(BeNil(), "NodeUnpublishVolume failed with error")
 
-	Logf("Completed testAttachWriteReadDetach with volume %v node %v\n", volID, instance.GetNodeID())
+	glog.Infof("Completed testAttachWriteReadDetach with volume %v node %v\n", volID, instance.GetNodeID())
 }

test/e2e/tests/setup_e2e_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang/glog"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	computebeta "google.golang.org/api/compute/v0.beta"
@@ -68,27 +69,32 @@ var _ = BeforeSuite(func() {
 	Expect(*project).ToNot(BeEmpty(), "Project should not be empty")
 	Expect(*serviceAccount).ToNot(BeEmpty(), "Service account should not be empty")
 
-	Logf("Running in project %v with service account %v\n\n", *project, *serviceAccount)
+	glog.Infof("Running in project %v with service account %v\n\n", *project, *serviceAccount)
 
 	for _, zone := range zones {
 		go func(curZone string) {
 			defer GinkgoRecover()
 			nodeID := fmt.Sprintf("gce-pd-csi-e2e-%s", curZone)
-			Logf("Setting up node %s\n", nodeID)
+			glog.Infof("Setting up node %s\n", nodeID)
 
 			i, err := remote.SetupInstance(*project, curZone, nodeID, *serviceAccount, computeService)
-			Expect(err).To(BeNil())
+			if err != nil {
+				glog.Fatalf("Failed to setup instance %v: %v", nodeID, err)
+			}
 
+			glog.Infof("Creating new driver and client for node %s\n", i.GetName())
 			// Create new driver and client
 			testContext, err := testutils.GCEClientAndDriverSetup(i)
-			Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")
+			if err != nil {
+				glog.Fatalf("Failed to set up Test Context for instance %v: %v", i.GetName(), err)
+			}
 			tcc <- testContext
 		}(zone)
 	}
 
 	for i := 0; i < len(zones); i++ {
 		tc := <-tcc
-		Logf("Test Context for node %s set up\n", tc.Instance.GetName())
+		glog.Infof("Test Context for node %s set up\n", tc.Instance.GetName())
 		testContexts = append(testContexts, tc)
 	}
 })

test/e2e/tests/single_zone_e2e_test.go

@@ -15,7 +15,6 @@ limitations under the License.
 package tests
 
 import (
-	"fmt"
 	"strings"
 	"time"
 
@@ -369,7 +368,3 @@ var _ = Describe("GCE PD CSI Driver", func() {
 		}()
 	})
 })
-
-func Logf(format string, args ...interface{}) {
-	fmt.Fprintf(GinkgoWriter, format, args...)
-}

test/remote/instance.go

@@ -89,7 +89,7 @@ func (i *InstanceInfo) CreateOrGetInstance(serviceAccount string) error {
 		return fmt.Errorf("Failed to create firewall rule: %v", err)
 	}
 
-	imageURL := "projects/ubuntu-os-cloud/global/images/family/ubuntu-minimal-1804-lts"
+	imageURL := "projects/debian-cloud/global/images/family/debian-9"
 	inst := &compute.Instance{
 		Name:        i.name,
 		MachineType: machineType(i.zone, ""),
@@ -132,7 +132,7 @@ func (i *InstanceInfo) CreateOrGetInstance(serviceAccount string) error {
 
 	if _, err := i.computeService.Instances.Get(i.project, i.zone, inst.Name).Do(); err != nil {
 		op, err := i.computeService.Instances.Insert(i.project, i.zone, inst).Do()
-		glog.V(4).Infof("Inserted instance %v in project %v, i.zone %v", inst.Name, i.project, i.zone)
+		glog.V(4).Infof("Inserted instance %v in project: %v, zone: %v", inst.Name, i.project, i.zone)
 		if err != nil {
 			ret := fmt.Sprintf("could not create instance %s: API error: %v", i.name, err)
 			if op != nil {

test/run-e2e.sh

@@ -5,4 +5,4 @@ set -x
 
 readonly PKGDIR=sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
-go test --v=true "${PKGDIR}/test/e2e/tests" --logtostderr --run-in-prow=true --delete-instances=true
+go test --timeout 20m --v "${PKGDIR}/test/e2e/tests" --logtostderr --run-in-prow=true --delete-instances=true -args -v=10