From 3d8913a43af5958d07f9e4598366b79ef15fea9b Mon Sep 17 00:00:00 2001
From: Erick Fejta <fejta@google.com>
Date: Fri, 19 Feb 2016 20:22:49 -0800
Subject: [PATCH] Use e2e tagged version of test images that aren't versioned

---
 test/e2e/container_probe.go   | 2 +-
 test/e2e/dns.go               | 6 +++---
 test/e2e/empty_dir_wrapper.go | 2 +-
 test/e2e/pods.go              | 4 ++--
 test/e2e/service.go           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/e2e/container_probe.go b/test/e2e/container_probe.go
index 32aa3b00a93..9b50efa123f 100644
--- a/test/e2e/container_probe.go
+++ b/test/e2e/container_probe.go
@@ -148,7 +148,7 @@ func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod {
 			Containers: []api.Container{
 				{
 					Name:           probTestContainerName,
-					Image:          "gcr.io/google_containers/test-webserver",
+					Image:          "gcr.io/google_containers/test-webserver:e2e",
 					LivenessProbe:  livenessProbe,
 					ReadinessProbe: readinessProbe,
 				},
diff --git a/test/e2e/dns.go b/test/e2e/dns.go
index 52fa979cf31..6819ccf88ff 100644
--- a/test/e2e/dns.go
+++ b/test/e2e/dns.go
@@ -61,7 +61,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod {
 				// TODO: Consider scraping logs instead of running a webserver.
 				{
 					Name:  "webserver",
-					Image: "gcr.io/google_containers/test-webserver",
+					Image: "gcr.io/google_containers/test-webserver:e2e",
 					Ports: []api.ContainerPort{
 						{
 							Name:          "http",
@@ -77,7 +77,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod {
 				},
 				{
 					Name:    "querier",
-					Image:   "gcr.io/google_containers/dnsutils",
+					Image:   "gcr.io/google_containers/dnsutils:e2e",
 					Command: []string{"sh", "-c", wheezyProbeCmd},
 					VolumeMounts: []api.VolumeMount{
 						{
@@ -88,7 +88,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod {
 				},
 				{
 					Name:    "jessie-querier",
-					Image:   "gcr.io/google_containers/jessie-dnsutils",
+					Image:   "gcr.io/google_containers/jessie-dnsutils:e2e",
 					Command: []string{"sh", "-c", jessieProbeCmd},
 					VolumeMounts: []api.VolumeMount{
 						{
diff --git a/test/e2e/empty_dir_wrapper.go b/test/e2e/empty_dir_wrapper.go
index 903b54d6264..2e5da33c640 100644
--- a/test/e2e/empty_dir_wrapper.go
+++ b/test/e2e/empty_dir_wrapper.go
@@ -134,7 +134,7 @@ var _ = Describe("EmptyDir wrapper volumes", func() {
 				Containers: []api.Container{
 					{
 						Name:  "secret-test",
-						Image: "gcr.io/google_containers/test-webserver",
+						Image: "gcr.io/google_containers/test-webserver:e2e",
 						VolumeMounts: []api.VolumeMount{
 							{
 								Name:      volumeName,
diff --git a/test/e2e/pods.go b/test/e2e/pods.go
index 352fca35380..635cd6ff22f 100644
--- a/test/e2e/pods.go
+++ b/test/e2e/pods.go
@@ -701,7 +701,7 @@ var _ = Describe("Pods", func() {
 				Containers: []api.Container{
 					{
 						Name:    "liveness",
-						Image:   "gcr.io/google_containers/liveness",
+						Image:   "gcr.io/google_containers/liveness:e2e",
 						Command: []string{"/server"},
 						LivenessProbe: &api.Probe{
 							Handler: api.Handler{
@@ -730,7 +730,7 @@ var _ = Describe("Pods", func() {
 				Containers: []api.Container{
 					{
 						Name:    "liveness",
-						Image:   "gcr.io/google_containers/liveness",
+						Image:   "gcr.io/google_containers/liveness:e2e",
 						Command: []string{"/server"},
 						LivenessProbe: &api.Probe{
 							Handler: api.Handler{
diff --git a/test/e2e/service.go b/test/e2e/service.go
index 1730886c449..d4fb1e41406 100644
--- a/test/e2e/service.go
+++ b/test/e2e/service.go
@@ -1776,7 +1776,7 @@ func NewServerTest(client *client.Client, namespace string, serviceName string)
 	t.services = make(map[string]bool)
 
 	t.name = "webserver"
-	t.image = "gcr.io/google_containers/test-webserver"
+	t.image = "gcr.io/google_containers/test-webserver:e2e"
 
 	return t
 }