summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-04 17:57:30 +0000
committerGerrit Code Review <review@openstack.org>2018-10-04 17:57:30 +0000
commitb2250bddbe702e2dfb2a6a0c85c925e50b7e7f7c (patch)
tree140f5e5574d9b39932c74d052e43175916fe5ac5
parent66de9440d17f603d9bc017217d10c7a3a6683be7 (diff)
parent38634f1aa6c9c6c60d7c94bde7ef743b4b6915af (diff)
Merge "Improve test stability"
-rwxr-xr-xtools/gate/scripts/020-test-divingbell.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/gate/scripts/020-test-divingbell.sh b/tools/gate/scripts/020-test-divingbell.sh
index 7039fda..c94adb6 100755
--- a/tools/gate/scripts/020-test-divingbell.sh
+++ b/tools/gate/scripts/020-test-divingbell.sh
@@ -164,11 +164,11 @@ dry_run(){
164 164
165get_container_status(){ 165get_container_status(){
166 local deployment="${1}" 166 local deployment="${1}"
167 container="$(kubectl get pods --namespace="${NAME}" | grep ${NAME}-${deployment} | cut -d' ' -f1)" 167 local log_connect_timeout=60
168 local log_connect_timeout=30
169 local log_connect_sleep_interval=2 168 local log_connect_sleep_interval=2
170 local wait_time=0 169 local wait_time=0
171 while : ; do 170 while : ; do
171 container="$(kubectl get pods --namespace="${NAME}" | grep ${NAME}-${deployment} | grep -v Terminating | cut -d' ' -f1)"
172 kubectl logs "${container}" --namespace="${NAME}" > /dev/null && break || \ 172 kubectl logs "${container}" --namespace="${NAME}" > /dev/null && break || \
173 echo "Waiting for container logs..." && \ 173 echo "Waiting for container logs..." && \
174 wait_time=$((${wait_time} + ${log_connect_sleep_interval})) && \ 174 wait_time=$((${wait_time} + ${log_connect_sleep_interval})) && \
@@ -1005,4 +1005,3 @@ test_overrides
1005init_default_state 1005init_default_state
1006 1006
1007echo "All tests pass for ${NAME}" 1007echo "All tests pass for ${NAME}"
1008