From 4544575e1125317bc65bffaf98c5b27ba4158ca8 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 8 Feb 2016 15:28:55 -0800 Subject: [PATCH] e2e: use the tagged busybox image to avoid unnecessary pulling --- test/e2e/configmap.go | 2 +- test/e2e/downward_api.go | 2 +- test/e2e/expansion.go | 6 +++--- test/e2e/garbage_collector.go | 2 +- test/e2e/job.go | 2 +- test/e2e/networking.go | 2 +- test/e2e/pd.go | 2 +- test/e2e/persistent_volumes.go | 2 +- test/e2e/pods.go | 16 ++++++++-------- test/e2e/pre_stop.go | 2 +- test/e2e/secrets.go | 2 +- test/e2e/security_context.go | 2 +- test/e2e/service.go | 2 +- test/e2e/volumes.go | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/test/e2e/configmap.go b/test/e2e/configmap.go index 24458ed0979..56b269c33c1 100644 --- a/test/e2e/configmap.go +++ b/test/e2e/configmap.go @@ -62,7 +62,7 @@ var _ = Describe("ConfigMap", func() { Containers: []api.Container{ { Name: "env-test", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "env"}, Env: []api.EnvVar{ { diff --git a/test/e2e/downward_api.go b/test/e2e/downward_api.go index 73fde0804ba..db67d57b5f6 100644 --- a/test/e2e/downward_api.go +++ b/test/e2e/downward_api.go @@ -91,7 +91,7 @@ func testDownwardAPI(framework *Framework, podName string, env []api.EnvVar, exp Containers: []api.Container{ { Name: "dapi-container", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "env"}, Env: env, }, diff --git a/test/e2e/expansion.go b/test/e2e/expansion.go index 3cd4806f457..3c73e359e53 100644 --- a/test/e2e/expansion.go +++ b/test/e2e/expansion.go @@ -37,7 +37,7 @@ var _ = Describe("Variable Expansion", func() { Containers: []api.Container{ { Name: "dapi-container", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "env"}, Env: []api.EnvVar{ { @@ -77,7 +77,7 @@ var _ = Describe("Variable Expansion", func() { Containers: []api.Container{ { Name: "dapi-container", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "TEST_VAR=wrong echo \"$(TEST_VAR)\""}, Env: []api.EnvVar{ { @@ -107,7 +107,7 @@ var _ = Describe("Variable Expansion", func() { Containers: []api.Container{ { Name: "dapi-container", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c"}, Args: []string{"TEST_VAR=wrong echo \"$(TEST_VAR)\""}, Env: []api.EnvVar{ diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index e30a5c1cc2f..f1f20148b3f 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -73,7 +73,7 @@ func createTerminatingPod(f *Framework) (*api.Pod, error) { Containers: []api.Container{ { Name: string(uuid), - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", }, }, }, diff --git a/test/e2e/job.go b/test/e2e/job.go index 5546a53b690..48c5edaa091 100644 --- a/test/e2e/job.go +++ b/test/e2e/job.go @@ -223,7 +223,7 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp Containers: []api.Container{ { Name: "c", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{}, VolumeMounts: []api.VolumeMount{ { diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 6d7268e2a7a..1c8d174ff18 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -64,7 +64,7 @@ var _ = Describe("Networking", func() { Containers: []api.Container{ { Name: contName, - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"wget", "-s", "google.com"}, }, }, diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 0126b826662..2cd8cb4f0cc 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -396,7 +396,7 @@ func testPDPod(diskNames []string, targetHost string, readOnly bool, numContaine containers[i].Name = fmt.Sprintf("mycontainer%v", i+1) } - containers[i].Image = "gcr.io/google_containers/busybox" + containers[i].Image = "gcr.io/google_containers/busybox:1.24" containers[i].Command = []string{"sleep", "6000"} diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 9673c831d73..041f8716734 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -162,7 +162,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod { Containers: []api.Container{ { Name: "scrub-checker", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh"}, Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"}, VolumeMounts: []api.VolumeMount{ diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 84cc3a151cd..aac1142aa67 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -618,7 +618,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "env3cont", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "env"}, }, }, @@ -647,7 +647,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "liveness", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; rm -rf /tmp/health; sleep 600"}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -674,7 +674,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "liveness", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 600"}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -799,7 +799,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "main", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"}, }, }, @@ -878,7 +878,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "main", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"}, }, }, @@ -943,7 +943,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: containerName, - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"}, }, }, @@ -994,7 +994,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: containerName, - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 5; rm -rf /tmp/health; sleep 600"}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -1035,7 +1035,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: containerName, - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"}, }, }, diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go index e34860bce6a..1c76c39d0bf 100644 --- a/test/e2e/pre_stop.go +++ b/test/e2e/pre_stop.go @@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) { Containers: []api.Container{ { Name: "tester", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sleep", "600"}, Lifecycle: &api.Lifecycle{ PreStop: &api.Handler{ diff --git a/test/e2e/secrets.go b/test/e2e/secrets.go index d63dbcabe5a..8b439a22eff 100644 --- a/test/e2e/secrets.go +++ b/test/e2e/secrets.go @@ -131,7 +131,7 @@ var _ = Describe("Secrets", func() { Containers: []api.Container{ { Name: "secret-env-test", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "env"}, Env: []api.EnvVar{ { diff --git a/test/e2e/security_context.go b/test/e2e/security_context.go index 5845db04eb1..953395fbc3a 100644 --- a/test/e2e/security_context.go +++ b/test/e2e/security_context.go @@ -47,7 +47,7 @@ func scTestPod(hostIPC bool, hostPID bool) *api.Pod { Containers: []api.Container{ { Name: "test-container", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", }, }, RestartPolicy: api.RestartPolicyNever, diff --git a/test/e2e/service.go b/test/e2e/service.go index 7fefcda4758..e83eb7f97b6 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -1031,7 +1031,7 @@ func createExecPodOrFail(c *client.Client, ns, name string) { Containers: []api.Container{ { Name: "exec", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"sh", "-c", "while true; do sleep 5; done"}, }, }, diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 1987f6366c0..cab3cda6ee5 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -293,7 +293,7 @@ func injectHtml(client *client.Client, config VolumeTestConfig, volume api.Volum Containers: []api.Container{ { Name: config.prefix + "-injector", - Image: "gcr.io/google_containers/busybox", + Image: "gcr.io/google_containers/busybox:1.24", Command: []string{"/bin/sh"}, Args: []string{"-c", "echo '" + content + "' > /mnt/index.html && chmod o+rX /mnt /mnt/index.html"}, VolumeMounts: []api.VolumeMount{