Add images used in common test into prepull image list.

This commit is contained in:
Random-Liu 2016-09-01 21:20:49 -07:00
parent d3270bce71
commit 76b35cf387

View File

@ -31,14 +31,20 @@ const (
maxImagePullRetries = 5 maxImagePullRetries = 5
// Sleep duration between image pull retry attempts. // Sleep duration between image pull retry attempts.
imagePullRetryDelay = time.Second imagePullRetryDelay = time.Second
busyBoxImage = iota
busyBoxImage = iota
epTestImage
hostExecImage hostExecImage
livenessImage
mountTestImage5
mountTestImage6
mountTestImage7
mountTestUserImage
netExecImage netExecImage
nginxImage nginxImage
mountTestImage
testWebServer
pauseImage pauseImage
serveHostnameImage
testWebServer
// Images just used for explicitly testing pulling of images // Images just used for explicitly testing pulling of images
pullTestAlpine pullTestAlpine
@ -48,13 +54,19 @@ const (
) )
var ImageRegistry = map[int]string{ var ImageRegistry = map[int]string{
busyBoxImage: "gcr.io/google_containers/busybox:1.24", busyBoxImage: "gcr.io/google_containers/busybox:1.24",
hostExecImage: "gcr.io/google_containers/hostexec:1.2", epTestImage: "gcr.io/google_containers/eptest:0.1",
netExecImage: "gcr.io/google_containers/netexec:1.4", hostExecImage: "gcr.io/google_containers/hostexec:1.2",
nginxImage: "gcr.io/google_containers/nginx-slim:0.7", livenessImage: "gcr.io/google_containers/liveness:e2e",
mountTestImage: "gcr.io/google_containers/mounttest:0.6", mountTestImage5: "gcr.io/google_containers/mounttest:0.5",
testWebServer: "gcr.io/google_containers/test-webserver:e2e", mountTestImage6: "gcr.io/google_containers/mounttest:0.6",
pauseImage: framework.GetPauseImageNameForHostArch(), mountTestImage7: "gcr.io/google_containers/mounttest:0.7",
mountTestUserImage: "gcr.io/google_containers/mounttest-user:0.3",
netExecImage: "gcr.io/google_containers/netexec:1.4",
nginxImage: "gcr.io/google_containers/nginx-slim:0.7",
pauseImage: framework.GetPauseImageNameForHostArch(),
serveHostnameImage: "gcr.io/google_containers/serve_hostname:v1.4",
testWebServer: "gcr.io/google_containers/test-webserver:e2e",
} }
// These are used by tests that explicitly test the ability to pull images // These are used by tests that explicitly test the ability to pull images