extended: debug failed tag update

openshift · Aug 26, 2016 · b7e3d89 · b7e3d89
1 parent a910aa8
commit b7e3d89
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/test/extended/deployments/deployments.go b/test/extended/deployments/deployments.go
@@ -10,6 +10,7 @@ import (
 	o "github.com/onsi/gomega"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util/wait"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
@@ -260,8 +261,21 @@ var _ = g.Describe("deploymentconfigs", func() {
 			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())
 
 			g.By("verifying the post deployment action happened: tag is set")
-			out, err := oc.Run("get").Args("istag/sample-stream:deployed").Output()
-			o.Expect(err).NotTo(o.HaveOccurred())
+			var out string
+			pollErr := wait.PollImmediate(100*time.Millisecond, 10*time.Second, func() (bool, error) {
+				out, err = oc.Run("get").Args("istag/sample-stream:deployed").Output()
+				if errors.IsNotFound(err) {
+					return false, nil
+				}
+				if err != nil {
+					return false, err
+				}
+				return true, nil
+			})
+			if pollErr == wait.ErrWaitTimeout {
+				pollErr = err
+			}
+			o.Expect(pollErr).NotTo(o.HaveOccurred())
 
 			if !strings.Contains(out, "origin-pod") {
 				err = fmt.Errorf("expected %q to be part of the image reference in %q", "origin-pod", out)

diff --git a/test/extended/testdata/tag-images-deployment.yaml b/test/extended/testdata/tag-images-deployment.yaml
@@ -12,7 +12,7 @@ spec:
     recreateParams:
       timeoutSeconds: 20
       post:
-        failurePolicy: Ignore
+        failurePolicy: Abort
         tagImages:
         - containerName: sample-name
           to: