openstack/deb-openstack-trove
Code Issues Proposed changes

When running in gate environment, don't start services

Browse Source 
When running in the gate environment, there's no need to start
services. Also, it is harder to dertermine whether the services are
wsgi'ed or not and that has been causing intermittent gate failures.

Change-Id: Ibe6a96a9319becf2053d26180fb7e6835a4e3a97
This commit is contained in:
Amrith Kumar 2017-06-29 12:08:10 -04:00
parent 7c258abb01
commit 822dfcee19
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/scripts/conf/test_begin.conf
View File

@ -20,7 +20,7 @@
"flavors": null,
"white_box":false,
"start_services": true,
"start_services": %startservices%,
"test_mgmt":false,
"use_local_ovz":false,
"use_venv":false,

6
integration/scripts/trovestack
View File

@ -700,6 +700,12 @@ function mod_confs() {
cat $DATASTORE_CONF | sudo tee -a $TEST_CONF > /dev/null
cat $TROVESTACK_SCRIPTS/conf/test_end.conf | sudo tee -a $TEST_CONF > /dev/null
#When running in the gate, don't start services
if [ "${DEVSTACK_GATE_TROVE}" == "1" ]; then
sed -i "s,%startservices%,false,g" ${TEST_CONF}
else
sed -i "s,%startservices%,true,g" ${TEST_CONF}
fi
#Add the paths to the test conf
sed -i "s,%report_directory%,$TROVE_REPORT_DIR,g" $TEST_CONF
sed -i "s,%keystone_path%,$PATH_KEYSTONE,g" $TEST_CONF