pulled kubeadm tests out of runTests to run before tests in test/cmd

Added timeout for https://github.com/kubernetes/kubeadm/issues/1430
This commit is contained in:
Thomas Runyon
2019-03-01 06:46:41 -05:00
parent a514fa042e
commit 1e44e33517
3 changed files with 22 additions and 2 deletions

View File

@@ -97,6 +97,20 @@ function create_node() {
__EOF__
}
# Run it if:
# 1) $WHAT is empty
# 2) $WHAT is not empty and kubeadm is part of $WHAT
WHAT=${WHAT:-}
if [[ ${WHAT} == "" || ${WHAT} =~ .*kubeadm.* ]] ; then
kube::log::status "Running kubeadm tests"
run_kubeadm_tests
# if we ONLY want to run kubeadm, then exit here.
if [[ ${WHAT} == "kubeadm" ]]; then
kube::log::status "TESTS PASSED"
exit 0
fi
fi
kube::log::status "Running kubectl tests for kube-apiserver"
setup