Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Apr 7, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,14 @@ test_e2e:

# 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:
# make test_e2e_node
# make test_e2e_node FOCUS=kubelet SKIP=container
# Build and run tests.
test_e2e_node:
hack/e2e-node-test.sh
hack/e2e-node-test.sh FOCUS=$(FOCUS) SKIP=$(SKIP)
.PHONY: test_e2e_node


Expand Down
5 changes: 4 additions & 1 deletion hack/e2e-node-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ 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'"
Expand All @@ -26,6 +29,6 @@ fi

# Provided for backwards compatibility
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 $?