summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
authoryuyang <Gabriel.yuyang@huawei.com>2017-03-27 15:41:23 +0800
committerYu Yang (Gabriel) <Gabriel.yuyang@huawei.com>2017-03-29 08:15:39 +0000
commit72d75db77faa31a1c116e7856e1487511a37a807 (patch)
tree7d38c40db9baedd410b708b656aaa2731cd053a5 /run_tests.sh
parent0d41307d670de19f1a27cda743bbac4d87367d0c (diff)
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 <Gabriel.yuyang@huawei.com> (cherry picked from commit fe83578bd2fe1a09f8334f85e30a0afbb68cc5cc)
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh14
1 files changed, 13 insertions, 1 deletions
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