From 87b0783808bde7513847d812d3d2c194f80afe26 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Thu, 11 Feb 2016 15:37:32 -0800 Subject: [PATCH] Update tests to use nettest:1.7 --- test/e2e/networking.go | 2 +- test/e2e/pods.go | 2 +- test/e2e/pre_stop.go | 2 +- test/images/network-tester/rc.json | 2 +- test/images/network-tester/slow-pod.json | 2 +- test/images/network-tester/slow-rc.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 1c8d174ff1..77460030de 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -157,7 +157,7 @@ var _ = Describe("Networking", func() { "Rerun it with at least two nodes to get complete coverage.") } - podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.6") + podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.7") // Clean up the pods defer func() { diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 4f4b86f924..352fca3538 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -758,7 +758,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "liveness", - Image: "gcr.io/google_containers/nettest:1.6", + Image: "gcr.io/google_containers/nettest:1.7", // These args are garbage but the image will exit if they're not there // we just care about /read serving a 200, which it always does. Args: []string{ diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go index 1c76c39d0b..b56a88baa8 100644 --- a/test/e2e/pre_stop.go +++ b/test/e2e/pre_stop.go @@ -43,7 +43,7 @@ func testPreStop(c *client.Client, ns string) { Containers: []api.Container{ { Name: "server", - Image: "gcr.io/google_containers/nettest:1.6", + Image: "gcr.io/google_containers/nettest:1.7", Ports: []api.ContainerPort{{ContainerPort: 8080}}, }, }, diff --git a/test/images/network-tester/rc.json b/test/images/network-tester/rc.json index 0e7375a526..3d5f2fd224 100644 --- a/test/images/network-tester/rc.json +++ b/test/images/network-tester/rc.json @@ -22,7 +22,7 @@ "containers": [ { "name": "webserver", - "image": "gcr.io/google_containers/nettest:1.6", + "image": "gcr.io/google_containers/nettest:1.7", "imagePullPolicy": "Always", "args": [ "-service=nettest", diff --git a/test/images/network-tester/slow-pod.json b/test/images/network-tester/slow-pod.json index 8fce984aed..d1745df6b8 100644 --- a/test/images/network-tester/slow-pod.json +++ b/test/images/network-tester/slow-pod.json @@ -11,7 +11,7 @@ "containers": [ { "name": "webserver", - "image": "gcr.io/google_containers/nettest:1.5", + "image": "gcr.io/google_containers/nettest:1.7", "args": [ "-service=nettest", "-delay-shutdown=10" diff --git a/test/images/network-tester/slow-rc.json b/test/images/network-tester/slow-rc.json index d70a145555..4a4e42f976 100644 --- a/test/images/network-tester/slow-rc.json +++ b/test/images/network-tester/slow-rc.json @@ -23,7 +23,7 @@ "containers": [ { "name": "webserver", - "image": "gcr.io/google_containers/nettest:1.5", + "image": "gcr.io/google_containers/nettest:1.7", "args": [ "-service=nettest", "-delay-shutdown=10"