openstack/nova
Code Issues Proposed changes

Use tempest [compute]/build_timeout in evacuate tests

Browse Source 
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
This commit is contained in:
Matt Riedemann 2018-12-05 10:46:06 -05:00
parent 5bf6f6304e
commit 3b1463b968
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gate/test_evacuate.sh
View File

@ -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)