openstack/trove
Code Issues Proposed changes

Merge "Disable devstack image building for trove-scenario-mariadb-single CI job"

Browse Source
This commit is contained in:
Zuul 2019-04-11 00:12:37 +00:00 committed by Gerrit Code Review
commit e7ef1dd722
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -193,6 +193,8 @@
name: trove-scenario-mariadb-single name: trove-scenario-mariadb-single
parent: trove-devstack-base parent: trove-devstack-base
vars: vars:
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
trove_test_datastore: mariadb trove_test_datastore: mariadb
trove_test_group: mariadb-supported-single trove_test_group: mariadb-supported-single

7
devstack/plugin.sh
View File

@ -357,9 +357,12 @@ function init_trove {
--os-project-name ${ALT_TENANT_NAME} --os-project-name ${ALT_TENANT_NAME}
# build and upload sample Trove mysql instance if not set otherwise # build and upload sample Trove mysql instance if not set otherwise
if [[ ${TROVE_DISABLE_IMAGE_SETUP} != "TRUE" ]]; then TROVE_DISABLE_IMAGE_SETUP=`echo ${TROVE_DISABLE_IMAGE_SETUP} | tr '[:upper:]' '[:lower:]'`
echo "Setup datastore image" if [[ ${TROVE_DISABLE_IMAGE_SETUP} != "true" ]]; then
echo "Setup datastore image."
_setup_minimal_image _setup_minimal_image
else
echo "Skip datastore image building."
fi fi
# If no guest image is specified, skip remaining setup # If no guest image is specified, skip remaining setup