From ad12c5707ac1191063af5cd33d54dd30ff649787 Mon Sep 17 00:00:00 2001 From: Yang Yu Date: Thu, 14 Sep 2017 10:38:29 +0800 Subject: bug-fix: make CLI available by adding docker operations JIRA: BOTTLENECK-197 offline test is executed which validated this patch Change-Id: Ib98e64781697839a7c1896d4089279d017d738ad Signed-off-by: Yang Yu --- run_tests.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 065e725a..ec237a59 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,7 @@ 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 fi -- cgit 1.2.3-korg