X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=2463edbfc6372b5a0633534035a94499ce0b3302;hb=73bd5d30fb9d5ee3bc01d78b431282332a53b44d;hp=065e725ab5d8c1a94f44b2d6d4cdbb656eda227a;hpb=1e67766fca7b8535cc84a19c7391dee1afd33d59;p=bottlenecks.git

diff --git a/run_tests.sh b/run_tests.sh
index 065e725a..2463edbf 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -103,7 +103,12 @@ function run_test(){
         ;;
         *)
             info "Running posca $test_level: $test_exec"
-            python ${POSCA_SUITE}/../run_testsuite.py $test_level $test_exec $REPORT
+            opts="--privileged=true -id"
+            docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp"
+            docker run $opts --name bottlenecks-load-master $docker_volume opnfv/bottlenecks:latest /bin/bash
+            sleep 5
+            POSCA_SCRIPT="/home/opnfv/bottlenecks/testsuites/posca"
+            docker exec bottlenecks-load-master python ${POSCA_SCRIPT}/../run_testsuite.py ${test_level} ${test_exec} ${REPORT}
         ;;
     esac
 }
@@ -171,7 +176,8 @@ fi
 # Clean up testing dockers
 if [[ ${cleanup} == true ]]; then
     info "Cleaning up docker-compose images and dockers"
-    docker-compose -f $BASEDIR/docker/bottleneck-compose/docker-compose.yml down --rmi all
     bash ${BASEDIR}/docker/docker_cleanup.sh -d influxdb --debug
     bash ${BASEDIR}/docker/docker_cleanup.sh -d bottlenecks --debug
+    bash ${BASEDIR}/docker/docker_cleanup.sh -d yardstick --debug
+    bash ${BASEDIR}/docker/docker_cleanup.sh -d elk --debug
 fi