Merge pull request #20799 from mfojtik/apps-60-raise-timeout

openshift-merge-robot · web-flow · commit a48b72bff2f8 · 2018-08-29T20:48:26.000-07:00
apps: raise trigger timeout for slow servers
diff --git a/test/extended/deployments/deployments.go b/test/extended/deployments/deployments.go
@@ -405,7 +405,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
 				dc, err := oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Get(dcName, metav1.GetOptions{})
 				o.Expect(err).NotTo(o.HaveOccurred())
 				latestVersion := dc.Status.LatestVersion
-				err = wait.PollImmediate(500*time.Millisecond, 10*time.Second, func() (bool, error) {
+				err = wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) {
 					dc, err = oc.AppsClient().AppsV1().DeploymentConfigs(oc.Namespace()).Get(dcName, metav1.GetOptions{})
 					o.Expect(err).NotTo(o.HaveOccurred())
 					latestVersion = dc.Status.LatestVersion
diff --git a/test/extended/deployments/util.go b/test/extended/deployments/util.go
@@ -575,6 +575,12 @@ func failureTrap(oc *exutil.CLI, name string, failed bool) {
 		}
 		e2e.Logf("\n%s\n", out)
 	}
+	out, err = oc.Run("get").Args("istag", "-o", "wide").Output()
+	if err != nil {
+		e2e.Logf("Error getting image stream tags: %v", err)
+	}
+	e2e.Logf("\n%s\n", out)
+
 }
 
 func failureTrapForDetachedRCs(oc *exutil.CLI, dcName string, failed bool) {

Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,12 @@ func failureTrap(oc *exutil.CLI, name string, failed bool) {`
`575`	`575`	`}`
`576`	`576`	`e2e.Logf("\n%s\n", out)`
`577`	`577`	`}`
	`578`	`+ out, err = oc.Run("get").Args("istag", "-o", "wide").Output()`
	`579`	`+ if err != nil {`
	`580`	`+ e2e.Logf("Error getting image stream tags: %v", err)`
	`581`	`+ }`
	`582`	`+ e2e.Logf("\n%s\n", out)`
	`583`	`+`
`578`	`584`	`}`
`579`	`585`
`580`	`586`	`func failureTrapForDetachedRCs(oc *exutil.CLI, dcName string, failed bool) {`