Merge pull request #25756 from janetkuo/e2e-fail-guestbook

Automatic merge from submit-queue Fix e2e test failure: pull redis image from gcr instead of docker ## Pull Request Guidelines 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. ```release-note * Use the release-note-* labels to set the release note state * Clear this block to use the PR title as the release note -OR- * Enter your extended release note here ``` Fixes #25677 cc @jayunit100 @fejta [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Merge pull request #25756 from janetkuo/e2e-fail-guestbook
8b59db7b · k8s-merge-robot · 07d10601 · e428b77c · 8b59db7b · 8b59db7b
Commit 8b59db7b authored May 17, 2016 by k8s-merge-robot
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

bindata.go test/e2e/generated/bindata.go +0 -0

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

No files found.
--- a/test/e2e/generated/bindata.go
+++ b/test/e2e/generated/bindata.go
--- a/test/e2e/kubectl.go
+++ b/test/e2e/kubectl.go
@@ -660,7 +660,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 			framework.SkipUnlessServerVersionGTE(nodePortsOptionalVersion, c)

 			mkpath := func(file string) string {
-				return "examples/guestbook-go/" + file
+				return kubeCtlManifestPath + "/" + file
 			}
 			controllerJson := framework.ReadOrDie(mkpath("redis-master-controller.json"))
 			serviceJson := framework.ReadOrDie(mkpath("redis-master-service.json"))