From a252a617a5eea7131b50f10a573ae2885f8496c9 Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Wed, 27 Nov 2019 17:44:25 +0100 Subject: [PATCH] drop KUBE_TIMEOUT in test/cmd/kubeadm.sh As runyontr remarked in test/cmd/kubeadm.sh: when https://github.com/kubernetes/kubeadm/issues/1430 is closed, KUBE_TIMEOUT can be removed. --- test/cmd/kubeadm.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/cmd/kubeadm.sh b/test/cmd/kubeadm.sh index 563106feabc..8edc613c246 100755 --- a/test/cmd/kubeadm.sh +++ b/test/cmd/kubeadm.sh @@ -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 }