mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #85718 from dholbach/dholbach/remove-kube-timeout
drop KUBE_TIMEOUT in test/cmd/kubeadm.sh
This commit is contained in:
commit
b4b0d1903d
@ -28,12 +28,9 @@ run_kubeadm_tests() {
|
|||||||
# comment this out to save yourself from needlessly building here.
|
# comment this out to save yourself from needlessly building here.
|
||||||
make -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
|
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 \
|
make -C "${KUBE_ROOT}" test \
|
||||||
WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd \
|
WHAT=k8s.io/kubernetes/cmd/kubeadm/test/cmd \
|
||||||
KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'" \
|
KUBE_TEST_ARGS="--kubeadm-path '${KUBEADM_PATH}'"
|
||||||
KUBE_TIMEOUT="--timeout=600s"
|
|
||||||
set +o nounset
|
set +o nounset
|
||||||
set +o errexit
|
set +o errexit
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user