Small adaptations in prepare_env,run_tests and common

Change-Id: I5f31392b04b168247e332bc2ea97efeb733cdf97
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index ab8e6e65..8e1e733e 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -35,6 +35,9 @@ examples:
     $(basename "$0") -t tempest,rally"
 
 
+BASEDIR=`dirname $0`
+source ${BASEDIR}/common.sh
+
 report=""
 clean=true
 serial=false
@@ -48,10 +51,11 @@ fi
 
 function clean_openstack(){
     if [ $clean == true ]; then
-        echo -e "\n\nCleaning Openstack environment..."
+        echo -e "\n"
+        info "Cleaning Openstack environment..."
         python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \
             $debug
-        echo -e "\n\n"
+        echo -e "\n"
     fi
 }
 
@@ -156,8 +160,7 @@ function run_test(){
             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"
-                exit 1
+                error "Make sure tempest was running before"
             fi
             tempest_dir=/home/opnfv/.rally/tempest/$tempest_dir
             pushd $tempest_dir
@@ -236,8 +239,6 @@ else
     arr_test=(healthcheck vping_ssh vping_userdata tempest vims rally)
 fi
 
-BASEDIR=`dirname $0`
-source ${BASEDIR}/common.sh
 
 info "Tests to be executed: ${arr_test[@]}"