From d9776ee8cad40f066b5ee936c0ee9b9cecf5a587 Mon Sep 17 00:00:00 2001 From: Paul Michali Date: Fri, 17 Jul 2015 07:30:27 -0400 Subject: [PATCH] VPNaaS: Enable devstack plugin for tests Now that the VPNaaS repo has a devstack plugin, we need to (apparently :) enable it for tests, before removing VPN related setup from the devstack repo. Change-Id: I72af2d48f58d885f8872b149517c7fabe6ec8cf7 --- neutron_vpnaas/tests/contrib/gate_hook.sh | 1 + neutron_vpnaas/tests/contrib/post_test_hook.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron_vpnaas/tests/contrib/gate_hook.sh b/neutron_vpnaas/tests/contrib/gate_hook.sh index 466687aa4..e6096334d 100644 --- a/neutron_vpnaas/tests/contrib/gate_hook.sh +++ b/neutron_vpnaas/tests/contrib/gate_hook.sh @@ -3,6 +3,7 @@ set -ex VENV=${1:-"dsvm-functional"} +export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" case $VENV in dsvm-functional | dsvm-functional-sswan) diff --git a/neutron_vpnaas/tests/contrib/post_test_hook.sh b/neutron_vpnaas/tests/contrib/post_test_hook.sh index a6a4463a0..41c3d7c29 100644 --- a/neutron_vpnaas/tests/contrib/post_test_hook.sh +++ b/neutron_vpnaas/tests/contrib/post_test_hook.sh @@ -3,7 +3,7 @@ set -xe NEUTRON_VPNAAS_DIR="$BASE/new/neutron-vpnaas" -TEMPEST_DIR="$BASE/new/tempest" +TEMPEST_CONFIG_DIR="$BASE/new/tempest/etc" SCRIPTS_DIR="/usr/local/jenkins/slave_scripts" VENV=${1:-"dsvm-functional"}