summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
authorYang Yu <Gabriel.yuyang@huawei.com>2017-09-14 10:38:29 +0800
committerYang Yu <Gabriel.yuyang@huawei.com>2017-09-14 10:45:35 +0800
commitad12c5707ac1191063af5cd33d54dd30ff649787 (patch)
tree49931b89f8797a96a183c44e81ffc4bc8c0214c7 /run_tests.sh
parent1e67766fca7b8535cc84a19c7391dee1afd33d59 (diff)
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 <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh9
1 files 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