delete timeouts for skipping volume-cloning tests

Author: amacaskill

test/k8s-integration/config/test-config-template.in

@@ -4,11 +4,6 @@ StorageClass:
 SnapshotClass:
   FromFile: {{ .SnapshotClassFile }}
 {{end}}
-{{if .Timeouts}}
-Timeouts:
-  {{ range $key, $value := .Timeouts }}{{ $key }}: {{ $value }}
-  {{ end }}
-{{end}}
 DriverInfo:
   Name: csi-gcepd-{{.StorageClass}}
   SupportedFsType:

test/k8s-integration/driver-config.go

@@ -17,18 +17,12 @@ type driverConfig struct {
 	SupportedFsType      []string
 	MinimumVolumeSize    string
 	NumAllowedTopologies int
-	Timeouts             map[string]string
 }
 
 const (
 	testConfigDir      = "test/k8s-integration/config"
 	configTemplateFile = "test-config-template.in"
 	configFile         = "test-config.yaml"
-	// configurable timeouts for the k8s e2e testsuites.
-	dataSourceProvisionTimeout = "480s"
-
-	// These are keys for the configurable timeout map.
-	dataSourceProvisionTimeoutKey = "DataSourceProvision"
 )
 
 // generateDriverConfigFile loads a testdriver config template and creates a file
@@ -129,11 +123,6 @@ func generateDriverConfigFile(testParams *testParameters, storageClassFile strin
 		minimumVolumeSize = "200Gi"
 		numAllowedTopologies = 2
 	}
-	// GCE PD CSI Driver takes in the order of minutes to provision storage with a pvc data source provisioned,
-	// and with dynamic provisioning (WaitForFirstCustomer policy), some e2e tests need a longer pod start timeout.
-	timeouts := map[string]string{
-		dataSourceProvisionTimeoutKey: dataSourceProvisionTimeout,
-	}
 	params := driverConfig{
 		StorageClassFile:     filepath.Join(testParams.pkgDir, testConfigDir, storageClassFile),
 		StorageClass:         storageClassFile[:strings.LastIndex(storageClassFile, ".")],
@@ -142,7 +131,6 @@ func generateDriverConfigFile(testParams *testParameters, storageClassFile strin
 		Capabilities:         caps,
 		MinimumVolumeSize:    minimumVolumeSize,
 		NumAllowedTopologies: numAllowedTopologies,
-		Timeouts:             timeouts,
 	}
 
 	// Write config file