summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-04-08 21:45:51 +1200
committerLingxian Kong <anlin.kong@gmail.com>2019-04-09 09:20:22 +1200
commit4fe95fbaf36c3c441c83d67d2fbc6be4d305621a (patch)
treec2c680242b7a8e1a75f7d1c62e1da048223335a6
parent6aa86cfaf4258748f70df35dd8c5d3a4e721d9a8 (diff)
downloadtrove-4fe95fbaf36c3c441c83d67d2fbc6be4d305621a.tar.gz
Disable devstack image building for trove-scenario-mariadb-single CI job
Trove mainly uses trovestack script to trigger the CI tests, including the guest agent image building, so the image building in devstack could be skipped to decrease the testing duration. Change-Id: I26fa0adc1a5e39612be15b75d37d22ea1cca3be1 Story: #2005391 Task: #30380
-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