Splits out build config params in Tempest.
The build parameters for instances and volumes should be configured separately.
This patch adds the following Tempest vars:
COMPUTE_BUILD_INTERVAL
COMPUTE_BUILD_TIMEOUT
VOLUME_BUILD_INTERVAL
VOLUME_BUILD_TIMEOUT
Change-Id: Ia5357114f8e4248a8de4bd0327e08323c487e897
diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index 5be709a..ffb3777 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -167,6 +167,10 @@
COMPUTE_LOG_LEVEL=ERROR
BUILD_INTERVAL=3
BUILD_TIMEOUT=400
+COMPUTE_BUILD_INTERVAL=3
+COMPUTE_BUILD_TIMEOUT=400
+VOLUME_BUILD_INTERVAL=3
+VOLUME_BUILD_TIMEOUT=300
RUN_SSH=True
# Check for DEFAULT_INSTANCE_USER and try to connect with that account
SSH_USER=${DEFAULT_INSTANCE_USER:-$OS_USERNAME}
@@ -219,6 +223,8 @@
s,%COMPUTE_LOG_LEVEL%,$COMPUTE_LOG_LEVEL,g;
s,%BUILD_INTERVAL%,$BUILD_INTERVAL,g;
s,%BUILD_TIMEOUT%,$BUILD_TIMEOUT,g;
+ s,%COMPUTE_BUILD_INTERVAL%,$COMPUTE_BUILD_INTERVAL,g;
+ s,%COMPUTE_BUILD_TIMEOUT%,$COMPUTE_BUILD_TIMEOUT,g;
s,%RUN_SSH%,$RUN_SSH,g;
s,%SSH_USER%,$SSH_USER,g;
s,%NETWORK_FOR_SSH%,$NETWORK_FOR_SSH,g;
@@ -246,6 +252,8 @@
s,%NETWORK_CATALOG_TYPE%,$NETWORK_CATALOG_TYPE,g;
s,%NETWORK_API_VERSION%,$NETWORK_API_VERSION,g;
s,%VOLUME_CATALOG_TYPE%,$VOLUME_CATALOG_TYPE,g;
+ s,%VOLUME_BUILD_INTERVAL%,$VOLUME_BUILD_INTERVAL,g;
+ s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g;
" -i $TEMPEST_CONF
echo "Created tempest configuration file:"