summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-04-15 11:58:27 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-15 11:58:27 +0000
commit72b5a019de8935434ebeb837b9e91bfe46cc67f3 (patch)
treefe841e98ebc9db107690bae4c9584be3375b0152
parentfb0a3a2edc09708310b79776360409051a84bd76 (diff)
parent8e2969f2137764a4a1b27d01d82b4d9babcdc519 (diff)
Merge "[BGPVPN] Use system wide installation of tempest"
-rwxr-xr-xdocker/run_tests.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 1c8910de2..682450eea 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -150,6 +150,9 @@ function run_test(){
;;
"bgpvpn")
info "Running BGPVPN Tempest test case..."
+ pushd ${repos_dir}/bgpvpn/
+ pip install --no-deps -e .
+ popd
tempest_dir=$(ls -t /home/opnfv/.rally/tempest/ |grep for-deploy |tail -1)
if [[ $tempest_dir == "" ]]; then
echo "Make sure tempest was running before"
@@ -157,15 +160,14 @@ function run_test(){
fi
tempest_dir=/home/opnfv/.rally/tempest/$tempest_dir
pushd $tempest_dir
- . .venv/bin/activate
- pip install --no-deps -e ~/repos/bgpvpn/.
mkdir -p /etc/tempest/
cp tempest.conf /etc/tempest/
echo "[service_available]
bgpvpn = True" >> /etc/tempest/tempest.conf
- ./run_tempest.sh -- networking_bgpvpn_tempest
+ ./run_tempest.sh -t -N -- networking_bgpvpn_tempest
rm -rf /etc/tempest/tempest.conf
popd
+ clean_openstack
;;
"onos")
info "Running ONOS test case..."