diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-22 13:15:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-22 13:15:52 +0000 |
| commit | 0b8f01a6a76f43b02b79352793bb92b44805ae71 (patch) | |
| tree | d47c4bde5e3255fb8a87648cd17f4e76de4c2a8b | |
| parent | 8b7e6e6a7931c431d9497d7a2cef0fa91e6c7b9b (diff) | |
| parent | 156318d6794d87874d2a675f3f621a38eab0ca65 (diff) | |
| download | trove-0b8f01a6a76f43b02b79352793bb92b44805ae71.tar.gz | |
Merge "Make trovestack able to run in the gate context"
| -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 |