Merge pull request #85718 from dholbach/dholbach/remove-kube-timeout

drop KUBE_TIMEOUT in test/cmd/kubeadm.sh
This commit is contained in:
Kubernetes Prow Robot 2019-12-12 14:22:32 -08:00 committed by GitHub
commit b4b0d1903d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,12 +28,9 @@ run_kubeadm_tests() {
# comment this out to save yourself from needlessly building here.
make -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
#TODO(runyontr): Remove the KUBE_TIMEOUT override when
# kubernetes/kubeadm/issues/1430 is fixed
make -C "${KUBE_ROOT}" test \
WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd \
KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'" \
KUBE_TIMEOUT="--timeout=600s"
KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'"
set +o nounset
set +o errexit
}