From fe83578bd2fe1a09f8334f85e30a0afbb68cc5cc Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 27 Mar 2017 15:41:23 +0800 Subject: Add docker clean-up for run test JIRA: BOTTLENECK-148 Currently, only OPNFV CI includes env-cleanup for Bottlenecks. It is preferable to also include the operation locally for test automation and repeatability. Changes: 1. Translate tab into 4 spaces Change-Id: I9f4efb95c155e442afd3141c00f707421c61b2da Signed-off-by: yuyang --- run_tests.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'run_tests.sh') diff --git a/run_tests.sh b/run_tests.sh index f6744bf1..97cbf28c 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -136,6 +136,15 @@ if [ "${testcase}" != "" ]; then done fi +#clean up correlated docker images +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 kibana --debug +bash ${BASEDIR}/docker/docker_cleanup.sh -d elasticsearch --debug +bash ${BASEDIR}/docker/docker_cleanup.sh -d influxdb --debug + +exit 0 + #run tests if [ "${teststory}" != "" ]; then test_level="teststory" @@ -151,4 +160,7 @@ if [ "${testcase}" != "" ]; then info "Start to run test case $i" run_test $i done -fi \ No newline at end of file +fi + +# echo "Bottlenecks: cleaning up docker-compose images and dockers" +# docker-compose -f $BASEDIR/docker/bottleneck-compose/docker-compose.yml down --rmi all \ No newline at end of file -- cgit 1.2.3-korg