@@ -95,7 +95,6 @@ CONCURRENCY="${CONCURRENCY:-}"
9595TEMPESTCONF_ARGS=" "
9696TEMPEST_ARGS=" "
9797TEMPEST_DEBUG_MODE=" ${TEMPEST_DEBUG_MODE:- false} "
98- TEMPEST_IMAGE_CREATE_TIMEOUT=" ${TEMPEST_IMAGE_CREATE_TIMEOUT:- 300} "
9998
10099function catch_error_if_debug {
101100 echo " File run_tempest.sh has run into an error!"
@@ -163,6 +162,7 @@ TEMPEST_EXTRA_IMAGES_FLAVOR_DISK="${TEMPEST_EXTRA_IMAGES_FLAVOR_DISK:-}"
163162TEMPEST_EXTRA_IMAGES_FLAVOR_VCPUS=" ${TEMPEST_EXTRA_IMAGES_FLAVOR_VCPUS:- } "
164163TEMPEST_EXTRA_IMAGES_FLAVOR_NAME=" ${TEMPEST_EXTRA_IMAGES_FLAVOR_NAME:- } "
165164TEMPEST_EXTRA_IMAGES_FLAVOR_OS_CLOUD=" ${TEMPEST_EXTRA_IMAGES_FLAVOR_OS_CLOUD:- } "
165+ TEMPEST_EXTRA_IMAGES_CREATE_TIMEOUT=" ${TEMPEST_EXTRA_IMAGES_CREATE_TIMEOUT:- } "
166166
167167# Convert comma separated lists to arrays
168168OLD_IFS=$IFS
@@ -178,6 +178,7 @@ read -ra TEMPEST_EXTRA_IMAGES_OS_CLOUD <<< $TEMPEST_EXTRA_IMAGES_OS_CLOUD
178178read -ra TEMPEST_EXTRA_IMAGES_ID <<< $TEMPEST_EXTRA_IMAGES_ID
179179read -ra TEMPEST_EXTRA_IMAGES_NAME <<< $TEMPEST_EXTRA_IMAGES_NAME
180180read -ra TEMPEST_EXTRA_IMAGES_CONTAINER_FORMAT <<< $TEMPEST_EXTRA_IMAGES_CONTAINER_FORMAT
181+ read -ra TEMPEST_EXTRA_IMAGES_CREATE_TIMEOUT <<< $TEMPEST_EXTRA_IMAGES_CREATE_TIMEOUT
181182
182183read -ra TEMPEST_EXTRA_IMAGES_FLAVOR_ID <<< $TEMPEST_EXTRA_IMAGES_FLAVOR_ID
183184read -ra TEMPEST_EXTRA_IMAGES_FLAVOR_RAM <<< $TEMPEST_EXTRA_IMAGES_FLAVOR_RAM
@@ -252,8 +253,8 @@ function upload_extra_images {
252253 while [ " $STATUS " != " active" ]; do
253254 echo " Current status: $STATUS . Waiting for image to become active..."
254255 sleep 5
255- if [ $(( $(date +% s) - $START_TIME )) -gt $TEMPEST_IMAGE_CREATE_TIMEOUT ]; then
256- echo " Error: Image creation exceeded the timeout period of $TEMPEST_IMAGE_CREATE_TIMEOUT seconds."
256+ if [ $(( $(date +% s) - $START_TIME )) -gt ${TEMPEST_EXTRA_IMAGES_CREATE_TIMEOUT[image_index]} ]; then
257+ echo " Error: Image creation exceeded the timeout period of ${TEMPEST_EXTRA_IMAGES_CREATE_TIMEOUT[image_index]} seconds."
257258 exit 1
258259 fi
259260 STATUS=$( get_image_status)
0 commit comments