diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 4524b3a3ad6..d45842c8c39 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -1215,7 +1215,7 @@ func testFailedDeployment(f *framework.Framework) { replicas := int32(1) // Create a nginx deployment. - deploymentName := "nginx" + deploymentName := "progress-check" nonExistentImage := "nginx:not-there" ten := int32(10) d := framework.NewDeployment(deploymentName, replicas, podLabels, nginxImageName, nonExistentImage, extensions.RecreateDeploymentStrategyType) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 5eec7132cea..98bd12e8d5f 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -3456,18 +3456,23 @@ 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 + var deployment *extensions.Deployment pollErr := wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) { - deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) + d, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) if err != nil { return false, err } - conditions = deployment.Status.Conditions + deployment = d cond := deploymentutil.GetDeploymentCondition(deployment.Status, condType) return cond != nil && cond.Reason == reason, nil }) if pollErr == wait.ErrWaitTimeout { - pollErr = fmt.Errorf("deployment %q never updated with the desired condition and reason: %v", deploymentName, conditions) + pollErr = fmt.Errorf("deployment %q never updated with the desired condition and reason: %v", deployment.Name, deployment.Status.Conditions) + _, allOldRSs, newRS, err := deploymentutil.GetAllReplicaSets(deployment, c) + if err == nil { + logReplicaSetsOfDeployment(deployment, allOldRSs, newRS) + } + logPodsOfDeployment(c, deployment) } return pollErr }