Skip to content

K
k3s
Commit 07d10601 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25765 from mtaufen/node_e2e_fix

Automatic merge from submit-queue Remove call to setup_env from hack/e2e-node-test.sh [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() 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
parents 088a683a ee079c95
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
hack/e2e-node-test.sh
View file @ 07d10601
...@@ -16,19 +16,17 @@ ...@@ -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 $?
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment