From 4fe95fbaf36c3c441c83d67d2fbc6be4d305621a Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Mon, 8 Apr 2019 21:45:51 +1200
Subject: [PATCH] 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
---
 .zuul.yaml         | 2 ++
 devstack/plugin.sh | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index aec9183c33..aa8e614d60 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 8f7f3bcb1c..823f1c05cb 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