Merge pull request #18215 from bparees/mirror

openshift-merge-robot · web-flow · commit e4baeb297548 · 2018-01-22T16:43:08.000-08:00
Automatic merge from submit-queue (batch tested with PRs 16780, 18192, 18202, 18215).

bump registry mirror test timeout
diff --git a/test/extended/images/prune.go b/test/extended/images/prune.go
@@ -22,7 +22,7 @@ import (
 
 const (
 	testImageSize     = 1024
-	mirrorBlobTimeout = time.Second * 10
+	mirrorBlobTimeout = time.Second * 30
 	// this image has a high number of relatively small blobs
 	externalImageReference = "docker.io/openshift/origin-release:golang-1.4"
 )

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`const (`
`24`	`24`	`testImageSize = 1024`
`25`		`- mirrorBlobTimeout = time.Second * 10`
	`25`	`+ mirrorBlobTimeout = time.Second * 30`
`26`	`26`	`// this image has a high number of relatively small blobs`
`27`	`27`	`externalImageReference = "docker.io/openshift/origin-release:golang-1.4"`
`28`	`28`	`)`