diff options
| author | Amrith Kumar <amrith@tesora.com> | 2016-10-18 08:00:46 -0400 |
|---|---|---|
| committer | Amrith Kumar <amrith@tesora.com> | 2016-10-20 14:50:14 -0400 |
| commit | 156318d6794d87874d2a675f3f621a38eab0ca65 (patch) | |
| tree | 13b66abf1b71d837d60cf283dc9350ed5ead5f17 /integration/scripts/trovestack | |
| parent | b0598f0c161e4bdb1c85c6d3aff41b477fbdcb37 (diff) | |
| download | trove-156318d6794d87874d2a675f3f621a38eab0ca65.tar.gz | |
Make trovestack able to run in the gate context
These changes are to make trovestack able to run in the dsvm-gate
context. The fundamental issue we're addressing is that the old
trove-integration was cloned into a writable area but in the current
(trove context) way of doing things, it is a read-only area. Therefore
you can't put the reports directory into the same relative place that
trove-integration would have done.
Change-Id: I449abf5a4ca574a2e9f5ddb1c8be507f5c5429a7
Diffstat (limited to 'integration/scripts/trovestack')
| -rwxr-xr-x | integration/scripts/trovestack | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 8aca8dc4..3f0b6170 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -664,9 +664,12 @@ function install_test_packages() { function mod_confs() { DATASTORE_TYPE=$1 + exclaim "Running mod_confs ..." sudo install -b --mode 0664 $TROVESTACK_SCRIPTS/conf/test_begin.conf $TEST_CONF - TROVE_REPORT_DIR=$TROVESTACK_SCRIPTS/../report/ + # cmd_dsvm_gate_tests will set this to be $HOME/report + TROVE_REPORT_DIR=${TROVE_REPORT_DIR:=TROVESTACK_SCRIPTS/../report/} + EXTRA_CONF=$TROVESTACK_SCRIPTS/conf/test.extra.conf if [ -e $EXTRA_CONF ]; then cat $EXTRA_CONF >> $TEST_CONF @@ -792,6 +795,7 @@ function cmd_build_image() { sudo $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS update sudo $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS install qemu sudo -H $HTTP_PROXY pip install --upgrade pip dib-utils + pkg_install python-yaml install_devstack_code @@ -1208,12 +1212,15 @@ function cmd_kick_start() { } function cmd_dsvm_gate_tests() { + exclaim "Running cmd_dsvm_gate_tests ..." DATASTORE_TYPE=${1:-'mysql'} TEST_GROUP=${2:-${DATASTORE_TYPE}} HOST_SCP_USERNAME=${3:-'jenkins'} GUEST_USERNAME=${4:-'ubuntu'} CONTROLLER_IP=${5:-'10.1.0.1'} ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} + export REPORT_DIRECTORY=${REPORT_DIRECTORY:=$HOME/dsvm-report/} + export TROVE_REPORT_DIR=$HOME/dsvm-report/ if [[ $BRANCH_OVERRIDE == "stable/liberty" ]]; then # Devstack in liberty doesn't copy the clouds.yaml file to /etc so we need to |