deploy: check the dc conditions instead of relying on deployer logs

test/extended/deployments/deployments.go

@@ -254,7 +254,16 @@ var _ = g.Describe("deploymentconfigs", func() {
 			g.By(fmt.Sprintf("checking the logs for substrings\n%s", out))
 			o.Expect(out).To(o.ContainSubstring("deployment-test-1 to 2"))
 			o.Expect(out).To(o.ContainSubstring("--> pre: Success"))
-			o.Expect(out).To(o.ContainSubstring("--> Success"))
+			// FIXME: In some cases the last line from the deployer pod log is lost so we
+			// can't check the '--> Success' message here.
+			// Instead of relying on the log message, verify the DC condition and check that
+			// the new RC is available. See: origin#13980
+			if dc, _, _, err := deploymentInfo(oc, "deployment-test"); err != nil {
+				o.Expect(err).NotTo(o.HaveOccurred())
+			} else {
+				cond := deployutil.GetDeploymentCondition(dc.Status, deployapi.DeploymentProgressing)
+				o.Expect(cond.Reason).To(o.BeEquivalentTo(deployapi.NewRcAvailableReason))
+			}
 
 			g.By("verifying the deployment is marked complete and scaled to zero")
 			o.Expect(waitForLatestCondition(oc, "deployment-test", deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())
@@ -304,7 +313,17 @@ var _ = g.Describe("deploymentconfigs", func() {
 				o.Expect(out).To(o.ContainSubstring(fmt.Sprintf("deployment-test-%d up to 1", i+2)))
 				o.Expect(out).To(o.ContainSubstring("--> pre: Success"))
 				o.Expect(out).To(o.ContainSubstring("test pre hook executed"))
-				o.Expect(out).To(o.ContainSubstring("--> Success"))
+
+				// FIXME: In some cases the last line from the deployer pod log is lost so we
+				// can't check the '--> Success' message here.
+				// Instead of relying on the log message, verify the DC condition and check that
+				// the new RC is available. See: origin#13980
+				if dc, _, _, err := deploymentInfo(oc, "deployment-test"); err != nil {
+					o.Expect(err).NotTo(o.HaveOccurred())
+				} else {
+					cond := deployutil.GetDeploymentCondition(dc.Status, deployapi.DeploymentProgressing)
+					o.Expect(cond.Reason).To(o.BeEquivalentTo(deployapi.NewRcAvailableReason))
+				}
 			}
 		})
 	})