Merge pull request #30964 from m1093782566/m109-master-density

Automatic merge from submit-queue [e2e test] Fix e2e test pause image hard code Use `framework.GetPauseImageName(f.Client)` instead of hard code(such as `"gcr.io/google_containers/pause-amd64:3.0"`) to represent pause image name. Related issus is #30967

Merge pull request #30964 from m1093782566/m109-master-density
6b333d1f · Kubernetes Submit Queue · GitHub · a316e6de · 47e0d4dc · 6b333d1f
Commit 6b333d1f authored Aug 21, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cluster_size_autoscaling.go test/e2e/cluster_size_autoscaling.go +1 -1

density.go test/e2e/density.go +1 -1

No files found.
--- a/test/e2e/cluster_size_autoscaling.go
+++ b/test/e2e/cluster_size_autoscaling.go
@@ -461,7 +461,7 @@ func CreateNodeSelectorPods(f *framework.Framework, id string, replicas int, nod
 		Name:         "node-selector",
 		Namespace:    f.Namespace.Name,
 		Timeout:      defaultTimeout,
-		Image:        "gcr.io/google_containers/pause-amd64:3.0",
+		Image:        framework.GetPauseImageName(f.Client),
 		Replicas:     replicas,
 		HostPorts:    map[string]int{"port1": 4321},
 		NodeSelector: map[string]string{"cluster-autoscaling-test.special-node": "true"},

--- a/test/e2e/density.go
+++ b/test/e2e/density.go
@@ -691,7 +691,7 @@ var _ = framework.KubeDescribe("Density", func() {
 			}
 			RCName = "density" + strconv.Itoa(totalPods) + "-" + strconv.Itoa(i) + "-" + uuid
 			RCConfigs[i] = framework.RCConfig{Client: c,
-				Image:                "gcr.io/google_containers/pause-amd64:3.0",
+				Image:                framework.GetPauseImageName(f.Client),
 				Name:                 RCName,
 				Namespace:            ns,
 				Labels:               map[string]string{"type": "densityPod"},