github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove call to setup_env from hack/e2e-node-test.sh

Browse Source 
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
This commit is contained in:
Michael Taufen 2016-05-17 11:01:41 -07:00
parent 835a2577f8
commit ee079c958a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e-node-test.sh
View File

@ -16,19 +16,17 @@
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env
focus=${FOCUS:-""} focus=${FOCUS:-""}
skip=${SKIP:-""} skip=${SKIP:-""}
ginkgo=$(kube::util::find-binary "ginkgo") ginkgo=$(kube::util::find-binary "ginkgo")
if [[ -z "${ginkgo}" ]]; then 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 exit 1
fi fi
# Provided for backwards compatibility # 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 "${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 $? exit $?