Merge pull request #17751 from deads2k/rebase-02-deployment-check

Automatic merge from submit-queue. re-enable deployment test fixes #17750. Adding debugging for a start.
openshift · Dec 15, 2017 · 89bbf2a · 89bbf2a
2 parents 2b1b989 + 56ac0bf
commit 89bbf2a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/pkg/oc/cli/cmd/rollout/cancel.go b/pkg/oc/cli/cmd/rollout/cancel.go
@@ -136,7 +136,14 @@ func (o CancelOptions) Run() error {
 				return runtime.Encode(o.Encoder, rc)
 			})
 
-			if len(patches) == 0 {
+			allPatchesEmpty := true
+			for _, patch := range patches {
+				if len(patch.Patch) > 0 {
+					allPatchesEmpty = false
+					break
+				}
+			}
+			if allPatchesEmpty {
 				kcmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already cancelled")
 				return false
 			}

diff --git a/test/extended/util/test.go b/test/extended/util/test.go
@@ -263,8 +263,6 @@ var (
 		// consistent 500 errors
 		"should expose prometheus metrics for a route",
 		"should expose the profiling endpoints",
-		// super flaky
-		"should only deploy the last deployment",
 
 		`\[Skipped\]`,
 		`\[Slow\]`,

diff --git a/test/testdata/failing-dc-mid.yaml b/test/testdata/failing-dc-mid.yaml
@@ -9,7 +9,7 @@ spec:
   strategy:
     type: Recreate
     recreateParams:
-      timeoutSeconds: 40
+      timeoutSeconds: 20
       mid:
         failurePolicy: Abort
         execNewPod:

diff --git a/test/testdata/failing-dc.yaml b/test/testdata/failing-dc.yaml
@@ -15,7 +15,7 @@ spec:
       intervalSeconds: 1
       maxSurge: 25%
       maxUnavailable: 25%
-      timeoutSeconds: 40
+      timeoutSeconds: 5
       updatePeriodSeconds: 1
       pre:
         failurePolicy: Abort