summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml2
-rw-r--r--devstack/plugin.sh7
2 files changed, 7 insertions, 2 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index aec9183c..aa8e614d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -193,6 +193,8 @@
name: trove-scenario-mariadb-single
parent: trove-devstack-base
vars:
+ devstack_localrc:
+ TROVE_DISABLE_IMAGE_SETUP: true
trove_test_datastore: mariadb
trove_test_group: mariadb-supported-single
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8f7f3bcb..823f1c05 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -357,9 +357,12 @@ function init_trove {
--os-project-name ${ALT_TENANT_NAME}
# build and upload sample Trove mysql instance if not set otherwise
- if [[ ${TROVE_DISABLE_IMAGE_SETUP} != "TRUE" ]]; then
- echo "Setup datastore image"
+ TROVE_DISABLE_IMAGE_SETUP=`echo ${TROVE_DISABLE_IMAGE_SETUP} | tr '[:upper:]' '[:lower:]'`
+ if [[ ${TROVE_DISABLE_IMAGE_SETUP} != "true" ]]; then
+ echo "Setup datastore image."
_setup_minimal_image
+ else
+ echo "Skip datastore image building."
fi
# If no guest image is specified, skip remaining setup