From 5acb667ce93661334f37a1f186b911b3db90d0d6 Mon Sep 17 00:00:00 2001 From: Kermit Alexander Date: Thu, 5 Aug 2021 17:59:04 +0000 Subject: [PATCH 1/2] Increase timeout to avoid test flaking in resize_nodes.go. --- test/e2e/cloud/gcp/resize_nodes.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/cloud/gcp/resize_nodes.go b/test/e2e/cloud/gcp/resize_nodes.go index ee722bff517..f69c9f649c6 100644 --- a/test/e2e/cloud/gcp/resize_nodes.go +++ b/test/e2e/cloud/gcp/resize_nodes.go @@ -130,9 +130,9 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { err = e2enode.WaitForReadyNodes(c, int(originalNodeCount-1), 10*time.Minute) framework.ExpectNoError(err) - ginkgo.By("waiting 1 minute for the watch in the podGC to catch up, remove any pods scheduled on " + + ginkgo.By("waiting 2 minutes for the watch in the podGC to catch up, remove any pods scheduled on " + "the now non-existent node and the RC to recreate it") - time.Sleep(time.Minute) + time.Sleep(2 * time.Minute) ginkgo.By("verifying whether the pods from the removed node are recreated") err = e2epod.VerifyPods(c, ns, name, true, originalNodeCount) From 57b372796619653891d9bf571cfc7d57cc4ebaae Mon Sep 17 00:00:00 2001 From: Kermit Alexander Date: Wed, 17 Nov 2021 17:35:24 +0000 Subject: [PATCH 2/2] Use PodStartShort for node deletion timeout. --- test/e2e/cloud/gcp/resize_nodes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/cloud/gcp/resize_nodes.go b/test/e2e/cloud/gcp/resize_nodes.go index f69c9f649c6..d86b7161dfb 100644 --- a/test/e2e/cloud/gcp/resize_nodes.go +++ b/test/e2e/cloud/gcp/resize_nodes.go @@ -132,7 +132,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { ginkgo.By("waiting 2 minutes for the watch in the podGC to catch up, remove any pods scheduled on " + "the now non-existent node and the RC to recreate it") - time.Sleep(2 * time.Minute) + time.Sleep(framework.NewTimeoutContextWithDefaults().PodStartShort) ginkgo.By("verifying whether the pods from the removed node are recreated") err = e2epod.VerifyPods(c, ns, name, true, originalNodeCount)