github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20837 from yujuhong/pull_images

Browse Source 
e2e: use the tagged busybox image to avoid unnecessary pulling
This commit is contained in:
Dawn Chen
2016-02-08 16:15:29 -08:00
parent c2f02996e4 4544575e11
commit 242000d790
14 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/pods.go
View File

@@ -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{
@@ -800,7 +800,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"},
},
},
@@ -879,7 +879,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"},
},
},
@@ -944,7 +944,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"},
},
},
@@ -995,7 +995,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{
@@ -1036,7 +1036,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"},
},
},