From 3b1463b968426ba8db1c5d458f6461e2375045e8 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 5 Dec 2018 10:46:06 -0500 Subject: [PATCH] Use tempest [compute]/build_timeout in evacuate tests Waiting 30 seconds for an evacuate to complete is not enough time on some slower CI test nodes. This change uses the same build timeout configuration from tempest to determine the overall evacuate timeout in our evacuate tests. Change-Id: Ie5935ae54d2cbf1a4272e93815ee5f67d3ffe2eb Closes-Bug: #1806925 --- gate/test_evacuate.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gate/test_evacuate.sh b/gate/test_evacuate.sh index c570167676..3b51125ac9 100755 --- a/gate/test_evacuate.sh +++ b/gate/test_evacuate.sh @@ -3,6 +3,8 @@ BASE=${BASE:-/opt/stack} # Source stackrc to determine the configured VIRT_DRIVER source ${BASE}/new/devstack/stackrc +# Source tempest to determine the build timeout configuration. +source ${BASE}/new/devstack/lib/tempest set -e # We need to get the admin credentials to run CLIs. @@ -79,8 +81,8 @@ function evacuate_and_wait_for_error() { do sleep 1 count=$((count+1)) - if [ ${count} -eq 30 ]; then - echo "Timed out waiting for server to go to ERROR status" + if [ ${count} -eq ${BUILD_TIMEOUT} ]; then + echo "Timed out waiting for server ${server} to go to ERROR status" exit 4 fi status=$(openstack server show ${server} -f value -c status) @@ -119,8 +121,8 @@ function evacuate_and_wait_for_active() { do sleep 1 count=$((count+1)) - if [ ${count} -eq 30 ]; then - echo "Timed out waiting for server to go to ACTIVE status" + if [ ${count} -eq ${BUILD_TIMEOUT} ]; then + echo "Timed out waiting for server ${server} to go to ACTIVE status" exit 6 fi status=$(openstack server show ${server} -f value -c status)