Merge pull request #2447 from kubernetes-sigs/increase-e2e-timeout

test: increase e2e test timeout

Author: andyzhangx

Makefile

@@ -88,7 +88,7 @@ e2e-test:
 		bash ./test/external-e2e/run.sh;\
 	else \
 		bash ./hack/parse-prow-creds.sh;\
-		go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS};\
+		go test -v -timeout=180m ./test/e2e ${GINKGO_FLAGS};\
 	fi
 
 .PHONY: e2e-bootstrap

test/e2e/testsuites/dynamically_provisioned_cmd_volume_tester.go

@@ -50,13 +50,9 @@ func (t *DynamicallyProvisionedCmdVolumeTest) Run(ctx context.Context, client cl
 		tpod.Create(ctx)
 		defer tpod.Cleanup(ctx)
 		ginkgo.By("checking that the pods command exits with no error")
-		if pod.WinServerVer == "windows-2022" {
-			if err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, tpod.client, tpod.pod.Name, tpod.namespace.Name, 15*time.Minute); err != nil {
-				ginkgo.By(fmt.Sprintf("hit error(%v) in first run, give another try", err))
-			}
-			tpod.WaitForSuccess(ctx)
-		} else {
-			tpod.WaitForSuccess(ctx)
+		if err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, tpod.client, tpod.pod.Name, tpod.namespace.Name, 15*time.Minute); err != nil {
+			ginkgo.By(fmt.Sprintf("hit error(%v) in first run, give another try", err))
 		}
+		tpod.WaitForSuccess(ctx)
 	}
 }

test/e2e/testsuites/testsuites.go

@@ -470,7 +470,7 @@ func (t *TestDeployment) WaitForPodReady(ctx context.Context) {
 	// always get first pod as there should only be one
 	pod := pods.Items[0]
 	t.podName = pod.Name
-	err = e2epod.WaitForPodRunningInNamespace(ctx, t.client, &pod)
+	err = e2epod.WaitForPodRunningInNamespaceSlow(ctx, t.client, pod.Name, t.namespace.Name)
 	framework.ExpectNoError(err)
 }
 
@@ -605,7 +605,7 @@ func (t *TestStatefulset) WaitForPodReady(ctx context.Context) {
 	// always get first pod as there should only be one
 	pod := statefulSetPods.Items[0]
 	t.podName = pod.Name
-	err = e2epod.WaitForPodRunningInNamespace(ctx, t.client, &pod)
+	err = e2epod.WaitForPodRunningInNamespaceSlow(ctx, t.client, pod.Name, t.namespace.Name)
 	framework.ExpectNoError(err)
 }
 
@@ -712,7 +712,7 @@ func (t *TestPod) WaitForSuccess(ctx context.Context) {
 }
 
 func (t *TestPod) WaitForRunning(ctx context.Context) {
-	err := e2epod.WaitForPodRunningInNamespace(ctx, t.client, t.pod)
+	err := e2epod.WaitForPodRunningInNamespaceSlow(ctx, t.client, t.pod.Name, t.namespace.Name)
 	framework.ExpectNoError(err)
 }