Browse Source

Merge "Improve test stability"

Zuul 6 months ago
parent
commit
b2250bddbe
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      tools/gate/scripts/020-test-divingbell.sh

+ 2
- 3
tools/gate/scripts/020-test-divingbell.sh View File

@@ -164,11 +164,11 @@ dry_run(){
164 164
 
165 165
 get_container_status(){
166 166
   local deployment="${1}"
167
-  container="$(kubectl get pods --namespace="${NAME}" | grep ${NAME}-${deployment} | cut -d' ' -f1)"
168
-  local log_connect_timeout=30
167
+  local log_connect_timeout=60
169 168
   local log_connect_sleep_interval=2
170 169
   local wait_time=0
171 170
   while : ; do
171
+    container="$(kubectl get pods --namespace="${NAME}" | grep ${NAME}-${deployment} | grep -v Terminating | cut -d' ' -f1)"
172 172
     kubectl logs "${container}" --namespace="${NAME}" > /dev/null && break || \
173 173
       echo "Waiting for container logs..." && \
174 174
       wait_time=$((${wait_time} + ${log_connect_sleep_interval})) && \
@@ -1005,4 +1005,3 @@ test_overrides
1005 1005
 init_default_state
1006 1006
 
1007 1007
 echo "All tests pass for ${NAME}"
1008
-

Loading…
Cancel
Save