github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23984 from vishh/skip-tests-node-e2e

Browse Source 
Automatic merge from submit-queue

Add an option to focus or skip tests in the node e2e makefile rule.

cc @kubernetes/sig-node
This commit is contained in:
k8s-merge-robot 2016-04-07 14:09:12 -07:00
commit 25ffc6ab03
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -93,10 +93,14 @@ test_e2e:
# Build and run node end-to-end tests. # Build and run node end-to-end tests.
# #
# Args:
# FOCUS: regexp that matches the tests to be run
# SKIP: regexp that matches the tests that needs to be skipped
# Example: # Example:
# make test_e2e_node # make test_e2e_node FOCUS=kubelet SKIP=container
# Build and run tests.
test_e2e_node: test_e2e_node:
hack/e2e-node-test.sh hack/e2e-node-test.sh FOCUS=$(FOCUS) SKIP=$(SKIP)
.PHONY: test_e2e_node .PHONY: test_e2e_node

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

@ -18,6 +18,9 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
focus=${FOCUS}
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 'hack/build-go.sh github.com/onsi/ginkgo/ginkgo'"
@ -26,6 +29,6 @@ fi
# Provided for backwards compatibility # Provided for backwards compatibility
sudo -v sudo -v
"${ginkgo}" "${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 $?