From ae5a901a8f2e4bf45a795ad3de10d1d66618590a Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Thu, 2 Feb 2017 16:58:13 -0800 Subject: [PATCH 1/2] Remove checks for pods responding in deployment e2e tests Remove it because it caused deployment e2e tests sometimes timed out waiting for pods responding, and pods responding isn't related to deployment controller and is not a prerequisite of deployment e2e tests. --- test/e2e/deployment.go | 10 +++++----- test/e2e/framework/util.go | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index cdab4b6b4d2..68162e424c3 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -289,7 +289,7 @@ func testRollingUpdateDeployment(f *framework.Framework) { _, err := c.Extensions().ReplicaSets(ns).Create(rs) Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. - err = framework.VerifyPods(c, ns, "sample-pod", false, 3) + err = framework.VerifyPodsRunning(c, ns, "sample-pod", false, 3) if err != nil { framework.Logf("error in waiting for pods to come up: %s", err) Expect(err).NotTo(HaveOccurred()) @@ -372,7 +372,7 @@ func testDeploymentCleanUpPolicy(f *framework.Framework) { Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. - err = framework.VerifyPods(c, ns, "cleanup-pod", false, 1) + err = framework.VerifyPodsRunning(c, ns, "cleanup-pod", false, 1) if err != nil { framework.Logf("error in waiting for pods to come up: %s", err) Expect(err).NotTo(HaveOccurred()) @@ -445,7 +445,7 @@ func testRolloverDeployment(f *framework.Framework) { _, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, rsReplicas, rsPodLabels, nginxImageName, nginxImage)) Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. - err = framework.VerifyPods(c, ns, podName, false, rsReplicas) + err = framework.VerifyPodsRunning(c, ns, podName, false, rsReplicas) if err != nil { framework.Logf("error in waiting for pods to come up: %s", err) Expect(err).NotTo(HaveOccurred()) @@ -855,7 +855,7 @@ func testDeploymentLabelAdopted(f *framework.Framework) { _, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, replicas, podLabels, podName, image)) Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. - err = framework.VerifyPods(c, ns, podName, false, 3) + err = framework.VerifyPodsRunning(c, ns, podName, false, 3) if err != nil { framework.Logf("error in waiting for pods to come up: %s", err) Expect(err).NotTo(HaveOccurred()) @@ -969,7 +969,7 @@ func testScaledRolloutDeployment(f *framework.Framework) { // Verify that the required pods have come up. By("Waiting for all required pods to come up") - err = framework.VerifyPods(f.ClientSet, ns, nginxImageName, false, *(deployment.Spec.Replicas)) + err = framework.VerifyPodsRunning(f.ClientSet, ns, nginxImageName, false, *(deployment.Spec.Replicas)) if err != nil { framework.Logf("error in waiting for pods to come up: %s", err) Expect(err).NotTo(HaveOccurred()) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 37aeb3c318f..c66ecf259a6 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1700,6 +1700,14 @@ func podsRunning(c clientset.Interface, pods *v1.PodList) []error { } func VerifyPods(c clientset.Interface, ns, name string, wantName bool, replicas int32) error { + return podRunningMaybeResponding(c, ns, name, wantName, replicas, true) +} + +func VerifyPodsRunning(c clientset.Interface, ns, name string, wantName bool, replicas int32) error { + return podRunningMaybeResponding(c, ns, name, wantName, replicas, false) +} + +func podRunningMaybeResponding(c clientset.Interface, ns, name string, wantName bool, replicas int32, checkResponding bool) error { pods, err := PodsCreated(c, ns, name, replicas) if err != nil { return err @@ -1708,9 +1716,11 @@ func VerifyPods(c clientset.Interface, ns, name string, wantName bool, replicas if len(e) > 0 { return fmt.Errorf("failed to wait for pods running: %v", e) } - err = PodsResponding(c, ns, name, wantName, pods) - if err != nil { - return fmt.Errorf("failed to wait for pods responding: %v", err) + if checkResponding { + err = PodsResponding(c, ns, name, wantName, pods) + if err != nil { + return fmt.Errorf("failed to wait for pods responding: %v", err) + } } return nil } From c9ee8b6c4f056d9bc1b258cd079cd0b6a0fc15c4 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Fri, 3 Feb 2017 10:38:42 -0800 Subject: [PATCH 2/2] Decrese #replicas for deployment e2e test --- test/e2e/deployment.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 68162e424c3..4524b3a3ad6 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -279,7 +279,7 @@ func testRollingUpdateDeployment(f *framework.Framework) { } rsName := "test-rolling-update-controller" - replicas := int32(3) + replicas := int32(1) rsRevision := "3546343826724305832" annotations := make(map[string]string) annotations[deploymentutil.RevisionAnnotation] = rsRevision @@ -289,7 +289,7 @@ func testRollingUpdateDeployment(f *framework.Framework) { _, err := c.Extensions().ReplicaSets(ns).Create(rs) Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. - err = framework.VerifyPodsRunning(c, ns, "sample-pod", false, 3) + err = framework.VerifyPodsRunning(c, ns, "sample-pod", false, replicas) if err != nil { framework.Logf("error in waiting for pods to come up: %s", err) Expect(err).NotTo(HaveOccurred()) @@ -441,7 +441,7 @@ func testRolloverDeployment(f *framework.Framework) { } rsName := "test-rollover-controller" - rsReplicas := int32(4) + rsReplicas := int32(3) _, err := c.Extensions().ReplicaSets(ns).Create(newRS(rsName, rsReplicas, rsPodLabels, nginxImageName, nginxImage)) Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. @@ -458,7 +458,7 @@ func testRolloverDeployment(f *framework.Framework) { // Create a deployment to delete nginx pods and instead bring up redis-slave pods. // We use a nonexistent image here, so that we make sure it won't finish deploymentName, deploymentImageName := "test-rollover-deployment", "redis-slave" - deploymentReplicas := int32(4) + deploymentReplicas := int32(3) deploymentImage := "gcr.io/google_samples/gb-redisslave:nonexistent" deploymentStrategyType := extensions.RollingUpdateDeploymentStrategyType framework.Logf("Creating deployment %q", deploymentName)