Merge "Rename devstack variable TROVE_DISABLE_IMAGE_SETUP"

This commit is contained in:
Zuul 2019-10-11 08:35:18 +00:00 committed by Gerrit Code Review
commit bdd44790fb
4 changed files with 20 additions and 23 deletions

View File

@ -164,7 +164,7 @@
trove_test_datastore: cassandra
trove_test_group: cassandra-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-cassandra-multi
@ -173,7 +173,7 @@
trove_test_datastore: cassandra
trove_test_group: cassandra-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-couchdb-single
@ -182,7 +182,7 @@
trove_test_datastore: couchdb
trove_test_group: couchdb-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-couchbase-single
@ -191,7 +191,7 @@
trove_test_datastore: couchbase
trove_test_group: couchbase-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-mariadb-single
@ -200,7 +200,7 @@
trove_test_datastore: mariadb
trove_test_group: mariadb-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-mariadb-multi
@ -209,7 +209,7 @@
trove_test_datastore: mariadb
trove_test_group: mariadb-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-mongodb-single
@ -218,7 +218,7 @@
trove_test_datastore: mongodb
trove_test_group: mongodb-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-mongodb-multi
@ -227,7 +227,7 @@
trove_test_datastore: mongodb
trove_test_group: mongodb-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-mysql-single
@ -250,7 +250,7 @@
trove_test_datastore: percona
trove_test_group: percona-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-percona-single
@ -259,7 +259,7 @@
trove_test_datastore: percona
trove_test_group: percona-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-postgresql-single
@ -268,7 +268,7 @@
trove_test_datastore: postgresql
trove_test_group: postgresql-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-postgresql-multi
@ -277,7 +277,7 @@
trove_test_datastore: postgresql
trove_test_group: postgresql-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-pxc-single
@ -286,7 +286,7 @@
trove_test_datastore: pxc
trove_test_group: pxc-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-pxc-multi
@ -295,7 +295,7 @@
trove_test_datastore: pxc
trove_test_group: pxc-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-redis-single
@ -304,7 +304,7 @@
trove_test_datastore: redis
trove_test_group: redis-supported-single
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-scenario-redis-multi
@ -313,7 +313,7 @@
trove_test_datastore: redis
trove_test_group: redis-supported-multi
devstack_localrc:
TROVE_DISABLE_IMAGE_SETUP: true
TROVE_ENABLE_IMAGE_BUILD: false
- job:
name: trove-tox-fakemodetests

View File

@ -436,8 +436,8 @@ function configure_tempest_for_trove {
# Use trovestack to create guest image and register the image in the datastore.
function create_guest_image {
TROVE_DISABLE_IMAGE_SETUP=`echo ${TROVE_DISABLE_IMAGE_SETUP,,}`
if [[ ${TROVE_DISABLE_IMAGE_SETUP} == "true" ]]; then
TROVE_ENABLE_IMAGE_BUILD=`echo ${TROVE_ENABLE_IMAGE_BUILD,,}`
if [[ ${TROVE_ENABLE_IMAGE_BUILD} == "false" ]]; then
echo "Skip creating guest image."
return 0
fi

View File

@ -86,5 +86,5 @@ enable_service trove tr-api tr-tmgr tr-cond
# Nova to use a single MQ for the computes to talk to the scheduler.
CELLSV2_SETUP=singleconductor
# Trove image configuration, by default we don't build image.
TROVE_DISABLE_IMAGE_SETUP=${TROVE_DISABLE_IMAGE_SETUP:-"true"}
# Enable or disable the Trove guest image build during devstack installation.
TROVE_ENABLE_IMAGE_BUILD=${TROVE_ENABLE_IMAGE_BUILD:-"true"}

View File

@ -107,9 +107,6 @@ configuration, change the ``HOST_IP`` to your own devstack host IP address:
SWIFT_HASH=66a3d6b56c1f479c8b4e70ab5c2000f5
SWIFT_REPLICAS=1
# Trove
TROVE_DISABLE_IMAGE_SETUP=False
Take a look at the
`options <https://opendev.org/openstack/trove/src/branch/master/devstack/settings>`_
you could use to customize the Trove installation.