From ee079c958a1f5aad9b2e80c2cab04c10d8b0f77d Mon Sep 17 00:00:00 2001
From: Michael Taufen <mtaufen@gmail.com>
Date: Tue, 17 May 2016 11:01:41 -0700
Subject: [PATCH] Remove call to setup_env from hack/e2e-node-test.sh

This messes with the GOPATH in a way that confuses ginkgo,
and doesn't appear to be necessary to run the tests

Removes likely unnecessary use of sudo, though it should be noted that
e2e_node_suite_test.go uses sudo to do something with locksmithd, so you
currently end up using it anyway.

Updates the error for not having ginkgo built to recommend the new vendor/
path for ginkgo, and to recommend using make instead of hack/build-go.sh

Should resolve #25682
---
 hack/e2e-node-test.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hack/e2e-node-test.sh b/hack/e2e-node-test.sh
index c2b9f23f964..f964f16d5bc 100755
--- a/hack/e2e-node-test.sh
+++ b/hack/e2e-node-test.sh
@@ -16,19 +16,17 @@
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
-kube::golang::setup_env
 
 focus=${FOCUS:-""}
 skip=${SKIP:-""}
 
 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'"
+  echo "You do not appear to have ginkgo built. Try 'make WHAT=vendor/github.com/onsi/ginkgo/ginkgo'"
   exit 1
 fi
 
 # Provided for backwards compatibility
-sudo -v
 "${ginkgo}" --focus=$focus --skip=$skip "${KUBE_ROOT}/test/e2e_node/" -- --alsologtostderr --v 2 --node-name $(hostname) --build-services=true --start-services=true --stop-services=true
 
 exit $?