From 25420bb1bbccb037866872efdf1e5d3458d286a6 Mon Sep 17 00:00:00 2001 From: Doug Wiegley Date: Tue, 11 Aug 2015 15:46:31 -0600 Subject: [PATCH] Setup reference service providers for API test runs Partial-bug: #1483266 Change-Id: Ia979fa2fdf25f3c1dbe9e7160d6dde2df51c305e --- neutron/tests/contrib/gate_hook.sh | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index 3da5775c0..0db93b3f3 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -1,21 +1,19 @@ #!/usr/bin/env bash - set -ex - VENV=${1:-"dsvm-functional"} +GATE_DEST=$BASE/new +DEVSTACK_PATH=$GATE_DEST/devstack if [ "$VENV" == "dsvm-functional" ] || [ "$VENV" == "dsvm-fullstack" ] then # The following need to be set before sourcing # configure_for_func_testing. - GATE_DEST=$BASE/new GATE_STACK_USER=stack NEUTRON_PATH=$GATE_DEST/neutron PROJECT_NAME=neutron - DEVSTACK_PATH=$GATE_DEST/devstack IS_GATE=True source $NEUTRON_PATH/tools/configure_for_func_testing.sh @@ -26,10 +24,22 @@ then configure_host_for_func_testing elif [ "$VENV" == "api" ] then - if [[ -z "$DEVSTACK_LOCAL_CONFIG" ]]; then - export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas" - else - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas" - fi + cat > $DEVSTACK_PATH/local.conf <