summaryrefslogtreecommitdiff
path: root/gate
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem.os@gmail.com>2018-12-05 10:46:06 -0500
committerMatt Riedemann <mriedem.os@gmail.com>2018-12-05 10:46:06 -0500
commit3b1463b968426ba8db1c5d458f6461e2375045e8 (patch)
treeb7f17ee39e9e155d8e2a164cfc3c30f8f7256787 /gate
parent5bf6f6304e185c4af2c1b19bc11631793acdfe02 (diff)
downloadnova-3b1463b968426ba8db1c5d458f6461e2375045e8.tar.gz
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
Diffstat (limited to 'gate')
-rwxr-xr-xgate/test_evacuate.sh10
1 files 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)