github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24830 from yujuhong/dummy_env

Browse Source 
Automatic merge from submit-queue

e2e: add a dummy environment variable in the service tests

This works around the docker bug:
https://github.com/docker/docker/issues/14203
This commit is contained in:
k8s-merge-robot
2016-04-26 18:53:41 -07:00
parent 3b09c64161 bdadaefe3b
commit 573ece20a2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/service.go
View File

@@ -1080,6 +1080,9 @@ func createPodOrFail(c *client.Client, ns, name string, labels map[string]string
Name: "test", Name: "test",
Image: "gcr.io/google_containers/pause:2.0", Image: "gcr.io/google_containers/pause:2.0",
Ports: containerPorts, Ports: containerPorts,
// Add a dummy environment variable to work around a docker issue.
// https://github.com/docker/docker/issues/14203
Env: []api.EnvVar{{Name: "FOO", Value: " "}},
}, },
}, },
}, },