Skip to content

Commit 101a6ce

Browse files
committed
[Tempest] Modify IMAGES_TIMEOUT for individual images
This patch allows to modify IMAGES_CREATION_TIMEOUT for individual images. This better fits the interface of the extraImges parameter in the Tempest CR [1]. [1] openstack-k8s-operators/test-operator#166
1 parent 651dd33 commit 101a6ce

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

container-images/tcib/base/os/tempest/run_tempest.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ CONCURRENCY="${CONCURRENCY:-}"
9595
TEMPESTCONF_ARGS=""
9696
TEMPEST_ARGS=""
9797
TEMPEST_DEBUG_MODE="${TEMPEST_DEBUG_MODE:-false}"
98-
TEMPEST_IMAGE_CREATE_TIMEOUT="${TEMPEST_IMAGE_CREATE_TIMEOUT:-300}"
9998

10099
function 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:-}"
163162
TEMPEST_EXTRA_IMAGES_FLAVOR_VCPUS="${TEMPEST_EXTRA_IMAGES_FLAVOR_VCPUS:-}"
164163
TEMPEST_EXTRA_IMAGES_FLAVOR_NAME="${TEMPEST_EXTRA_IMAGES_FLAVOR_NAME:-}"
165164
TEMPEST_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
168168
OLD_IFS=$IFS
@@ -178,6 +178,7 @@ read -ra TEMPEST_EXTRA_IMAGES_OS_CLOUD <<< $TEMPEST_EXTRA_IMAGES_OS_CLOUD
178178
read -ra TEMPEST_EXTRA_IMAGES_ID <<< $TEMPEST_EXTRA_IMAGES_ID
179179
read -ra TEMPEST_EXTRA_IMAGES_NAME <<< $TEMPEST_EXTRA_IMAGES_NAME
180180
read -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

182183
read -ra TEMPEST_EXTRA_IMAGES_FLAVOR_ID <<< $TEMPEST_EXTRA_IMAGES_FLAVOR_ID
183184
read -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

Comments
 (0)