Merge "gate: Introduce POD_START_TIMEOUT (default 480s)"

This commit is contained in:
Jenkins 2017-09-14 15:43:19 +00:00 committed by Gerrit Code Review
commit af77125f10
3 changed files with 3 additions and 2 deletions

View File

@ -122,7 +122,7 @@ function kubeadm_aio_launch {
${WORK_DIR}/tools/kubeadm-aio/kubeadm-aio-launcher.sh
mkdir -p ${HOME}/.kube
cat ${KUBECONFIG} > ${HOME}/.kube/config
kube_wait_for_pods kube-system 240
kube_wait_for_pods kube-system ${POD_START_TIMEOUT}
kube_wait_for_pods default 240
}

View File

@ -44,7 +44,7 @@ rm -rf ${SUB_NODE_PROVISION_SCRIPT}
source ${WORK_DIR}/tools/gate/funcs/kube.sh
kube_wait_for_nodes ${SUB_NODE_COUNT} 240
kube_wait_for_pods kube-system 240
kube_wait_for_pods kube-system ${POD_START_TIMEOUT}
kube_wait_for_pods openstack 240
kubectl get nodes --show-all
kubectl get --all-namespaces all --show-all

View File

@ -52,6 +52,7 @@ export SDN_PLUGIN=${SDN_PLUGIN:-"ovs"}
export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8"}
# Set gate script timeouts
export POD_START_TIMEOUT=${POD_START_TIMEOUT:="480"}
export SERVICE_LAUNCH_TIMEOUT=${SERVICE_LAUNCH_TIMEOUT:="600"}
export SERVICE_TEST_TIMEOUT=${SERVICE_TEST_TIMEOUT:="600"}