Add local support for config preparation before testing

[bottlenecks.git] / run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index 4110420..065e725 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -27,7 +27,6 @@ where:
     --report          push results to DB (false by default)
 
 examples:
-    $(basename "$0")
     $(basename "$0") -s posca_factor_test"
 
 # Define global variables
@@ -42,11 +41,11 @@ cleanup=false
 
 # Define alias for log printing
 info () {
-    logger -s -t "bottlenecks.info" "$*"
+    logger -s -t "BOTTLENECKS INFO" "$*"
 }
 
 error () {
-    logger -s -t "bottlenecks.error" "$*"
+    logger -s -t "BOTTLENECKS ERROR" "$*"
     exit 1
 }
 
@@ -103,13 +102,8 @@ function run_test(){
                   If you want to run VSTF, please refer to earlier releases."
         ;;
         *)
-            info "Composing up dockers"
-            docker-compose -f /home/opnfv/bottlenecks/docker/bottleneck-compose/docker-compose.yml up -d
-            info "Pulling tutum/influxdb for yardstick"
-            docker pull tutum/influxdb:0.13
-            sleep 5
             info "Running posca $test_level: $test_exec"
-            docker exec bottleneckcompose_bottlenecks_1 python ${POSCA_SUITE}/run_posca.py $test_level $test_exec $REPORT
+            python ${POSCA_SUITE}/../run_testsuite.py $test_level $test_exec $REPORT
         ;;
     esac
 }