From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Fri, 15 Apr 2016 11:19:39 +0000 (+0200)
Subject: [BGPVPN] Use system wide installation of tempest
X-Git-Tag: colorado.1.0~444^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F12335%2F1;p=functest.git

[BGPVPN] Use system wide installation of tempest

Since rally setup tempest system-wide now
we do not integrate with the virtual env
of tempest anymore.

Change-Id: Ia5f132371c4eb0b67ac84bf044b349480195f633
---

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..."