From 082cdd5ad4c89cf619204c51de328816d8764873 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 4 Mar 2016 16:01:55 -0500
Subject: [PATCH] hack/e2e-node-test should not assume ginkgo installed

It should use the version we build.
---
 hack/e2e-node-test.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hack/e2e-node-test.sh b/hack/e2e-node-test.sh
index 3a4dbd9bb3e..32f338bd9a0 100755
--- a/hack/e2e-node-test.sh
+++ b/hack/e2e-node-test.sh
@@ -14,8 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+kube::golang::setup_env
+
+ginkgo=$(kube::util::find-binary "ginkgo")
+if [[ -z "${ginkgo}" ]]; then
+  echo "You do not appear to have ginkgo built. Try 'hack/build-go.sh github.com/onsi/ginkgo/ginkgo'"
+  exit 1
+fi
+
 # Provided for backwards compatibility
 sudo -v
-ginkgo "$(dirname $0)/../test/e2e_node/" -- --alsologtostderr --v 2 --node-name $(hostname) --build-services=true --start-services=true --stop-services=true
+"${ginkgo}" "${KUBE_ROOT}/test/e2e_node/" -- --alsologtostderr --v 2 --node-name $(hostname) --build-services=true --start-services=true --stop-services=true
 
 exit $?