From 9fda26e5dacbbe80b4832d3549e0cd8291c8be6d Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 16 Jun 2015 11:31:33 -0700 Subject: [PATCH] Switch to loading busybox from gcr. --- hack/e2e-suite/services.sh | 4 ++-- test/e2e/persistent_volumes.go | 2 +- test/e2e/pre_stop.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/e2e-suite/services.sh b/hack/e2e-suite/services.sh index 863c08dbf96..da1078600cd 100755 --- a/hack/e2e-suite/services.sh +++ b/hack/e2e-suite/services.sh @@ -280,8 +280,8 @@ function verify_from_container() { echo "waiting for $1 at $2:$3" results=($(ssh-to-node "${test_node}" " set -e; - sudo docker pull busybox >/dev/null; - sudo docker run busybox sh -c ' + sudo docker pull gcr.io/google_containers/busybox >/dev/null; + sudo docker run gcr.io/google_containers/busybox sh -c ' for i in $(seq -s' ' 1 $(($4*3))); do if wget -q -T 3 -O - http://$2:$3; then echo diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 95d080ac1be..8a4d3d2e9a1 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -172,7 +172,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod { Containers: []api.Container{ { Name: "scrub-checker", - Image: "busybox", + Image: "gcr.io/google_containers/busybox", Command: []string{"/bin/sh"}, Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"}, VolumeMounts: []api.VolumeMount{ diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go index 43af2355f00..45c6c86c83d 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: "busybox", + Image: "gcr.io/google_containers/busybox", Command: []string{"sleep", "600"}, Lifecycle: &api.Lifecycle{ PreStop: &api.Handler{