Merge pull request #11654 from mfojtik/deployments-follow

Merged by openshift-bot

Author: OpenShift Bot

test/extended/deployments/deployments.go

@@ -290,24 +290,31 @@ var _ = g.Describe("deploymentconfigs", func() {
 
 	g.Describe("with env in params referencing the configmap [Conformance]", func() {
 		g.AfterEach(func() {
-			failureTrap(oc, "example", g.CurrentGinkgoTestDescription().Failed)
+			failureTrap(oc, "deploymenty-simple", g.CurrentGinkgoTestDescription().Failed)
 		})
 		g.It("should expand the config map key to a value", func() {
 			_, err := oc.Run("create").Args("configmap", "test", "--from-literal=foo=bar").Output()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			_, name, err := createFixture(oc, envRefDeploymentFixture)
 			o.Expect(err).NotTo(o.HaveOccurred())
+			o.Expect(waitForSyncedConfig(oc, name, deploymentRunTimeout)).NotTo(o.HaveOccurred())
+
+			_, err = oc.Run("rollout").Args("latest", "dc/"+name).Output()
+			o.Expect(err).NotTo(o.HaveOccurred())
+
+			out, _ := oc.Run("rollout").Args("status", "dc/"+name).Output()
+			o.Expect(out).To(o.ContainSubstring("has failed progressing"))
 
-			out, err := oc.Run("deploy").Args("dc/"+name, "--latest", "--follow").Output()
+			out, err = oc.Run("logs").Args("dc/" + name).Output()
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(out).To(o.ContainSubstring("hello bar"))
 		})
 	})
 
 	g.Describe("with multiple image change triggers [Conformance]", func() {
 		g.AfterEach(func() {
-			failureTrap(oc, "example", g.CurrentGinkgoTestDescription().Failed)
+			failureTrap(oc, "deployment-simple", g.CurrentGinkgoTestDescription().Failed)
 		})
 
 		g.It("should run a successful deployment with multiple triggers", func() {
@@ -536,11 +543,16 @@ var _ = g.Describe("deploymentconfigs", func() {
 				o.Expect(fmt.Errorf("expected no deployment, found %#v", rcs[0])).NotTo(o.HaveOccurred())
 			}
 
-			g.By("verifying that we cannot start a new deployment")
+			g.By("verifying that we cannot start a new deployment via oc deploy")
 			out, err := oc.Run("deploy").Args(resource, "--latest").Output()
 			o.Expect(err).To(o.HaveOccurred())
 			o.Expect(out).To(o.ContainSubstring("cannot deploy a paused deployment config"))
 
+			g.By("verifying that we cannot start a new deployment via oc rollout")
+			out, err = oc.Run("rollout").Args("latest", resource).Output()
+			o.Expect(err).To(o.HaveOccurred())
+			o.Expect(out).To(o.ContainSubstring("cannot deploy a paused deployment config"))
+
 			g.By("verifying that we cannot cancel a deployment")
 			out, err = oc.Run("deploy").Args(resource, "--cancel").Output()
 			o.Expect(err).To(o.HaveOccurred())

test/extended/testdata/deployments/deployment-with-ref-env.yaml

@@ -20,14 +20,14 @@ spec:
                 configMapKeyRef:
                   name: test
                   key: foo
-          command: ["/bin/bash", "-c", "echo hello ${HELLO}"]
+          command: ["/bin/bash", "-c", "echo hello ${HELLO} && exit 1"]
   template:
     metadata:
       labels:
         name: deployment-simple
     spec:
       containers:
       - image: "openshift/origin-base:latest"
-        args: [ "sleep 120" ]
+        command: [ "/bin/bash", "-c", "sleep infinity" ]
         imagePullPolicy: IfNotPresent
         name: myapp