Removed all pause image constant strings, now the pause image is chosen by arch. Part of the effort of making e2e arch-agnostic

This commit is contained in:
Lucas Käldström
2016-05-26 19:16:43 +03:00
parent 965e8dce12
commit 79ca1911e1
26 changed files with 121 additions and 111 deletions

View File

@@ -785,7 +785,7 @@ func runSchedulerNoPhantomPodsTest(client *client.Client) {
Containers: []api.Container{
{
Name: "c1",
Image: "gcr.io/google_containers/pause-amd64:3.0",
Image: e2e.GetPauseImageName(client),
Ports: []api.ContainerPort{
{ContainerPort: 1234, HostPort: 9999},
},
@@ -795,7 +795,7 @@ func runSchedulerNoPhantomPodsTest(client *client.Client) {
},
}
// Assuming we only have two kublets, the third pod here won't schedule
// Assuming we only have two kubelets, the third pod here won't schedule
// if the scheduler doesn't correctly handle the delete for the second
// pod.
pod.ObjectMeta.Name = "phantom.foo"