Merge pull request #40971 from kargakis/lack-of-progress-fix

Automatic merge from submit-queue (batch tested with PRs 40971, 41027, 40709, 40903, 39369) test: bump deployment condition timeout @fejta @spxtr ptal Fixes https://github.com/kubernetes/kubernetes/issues/39785

Merge pull request #40971 from kargakis/lack-of-progress-fix
4db40cbd · Kubernetes Submit Queue · GitHub · 821e1712 · e8f1d9ba · 4db40cbd
Commit 4db40cbd authored Feb 06, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.go test/e2e/framework/util.go +1 -1

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -3447,7 +3447,7 @@ func WaitForObservedDeployment(c clientset.Interface, ns, deploymentName string,

 func WaitForDeploymentWithCondition(c clientset.Interface, ns, deploymentName, reason string, condType extensions.DeploymentConditionType) error {
 	var conditions []extensions.DeploymentCondition
-	pollErr := wait.PollImmediate(time.Second, 1*time.Minute, func() (bool, error) {
+	pollErr := wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) {
 		deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{})
 		if err != nil {
 			return false, err