diff options
| author | Amrith Kumar <amrith@amrith.org> | 2017-06-29 12:08:10 -0400 |
|---|---|---|
| committer | Amrith Kumar <amrith@amrith.org> | 2017-06-29 12:08:10 -0400 |
| commit | 822dfcee19905ec20387613faedbbc653ac0d6f9 (patch) | |
| tree | cafdcd46a340d9361b98099ac5fa886fb6164e12 | |
| parent | 7c258abb01047355813be6a1002b4c1c253ab41c (diff) | |
| download | trove-822dfcee19905ec20387613faedbbc653ac0d6f9.tar.gz | |
When running in gate environment, don't start services
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
| -rw-r--r-- | integration/scripts/conf/test_begin.conf | 2 | ||||
| -rwxr-xr-x | integration/scripts/trovestack | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/integration/scripts/conf/test_begin.conf b/integration/scripts/conf/test_begin.conf index 1352ecc5..0d6a7e5d 100644 --- a/integration/scripts/conf/test_begin.conf +++ b/integration/scripts/conf/test_begin.conf @@ -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, diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 59bb6a5a..69e8149e 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -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 |