@@ -290,7 +290,7 @@ 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()

@@ -298,8 +298,15 @@ var _ = g.Describe("deploymentconfigs", func() {

 			_, name, err := createFixture(oc, envRefDeploymentFixture)

 			o.Expect(err).NotTo(o.HaveOccurred())

+			o.Expect(waitForSyncedConfig(oc, name, deploymentRunTimeout)).NotTo(o.HaveOccurred())

-			out, err := oc.Run("deploy").Args("dc/"+name, "--latest", "--follow").Output()

+			_, 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("logs").Args("dc/" + name).Output()

 			o.Expect(err).NotTo(o.HaveOccurred())

 			o.Expect(out).To(o.ContainSubstring("hello bar"))

 		})

@@ -307,7 +314,7 @@ var _ = g.Describe("deploymentconfigs", func() {

 	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() {

@@ -542,7 +549,7 @@ var _ = g.Describe("deploymentconfigs", func() {

 			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()

+			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"))

@@ -20,7 +20,7 @@ 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:

@@ -28,6 +28,6 @@ spec:

     spec:

       containers:

       - image: "openshift/origin-base:latest"

-        args: [ "sleep 120" ]

+        command: [ "/bin/bash", "-c", "sleep infinity" ]

         imagePullPolicy: IfNotPresent

         name: myapp