Remove data folder in CSIT teardown

 - Remove data folder by force as sudo in kill script
 - Fix script name output (also in vid's corresponding script)

Issue-ID: SDC-2362
Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com>
Change-Id: I91f031c74e7ae05ec4645677ec8c07b34ed28c0b

diff --git a/scripts/sdc/kill_containers_and_remove_dataFolders.sh b/scripts/sdc/kill_containers_and_remove_dataFolders.sh
index f231a26..6cc4756 100644 (file)
--- a/scripts/sdc/kill_containers_and_remove_dataFolders.sh
+++ b/scripts/sdc/kill_containers_and_remove_dataFolders.sh
@@ -15,9 +15,10 @@
 # limitations under the License.
 #
 # Modifications copyright (c) 2017 AT&T Intellectual Property
+# Modifications copyright (c) 2019 Samsung Electronics Co., Ltd.
 #
 
-echo "This is ${WORKSPACE}/scripts/sdc/kill_and_remove_dataFolder.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh"
 
 # copy logs to archive
 
@@ -27,13 +28,9 @@ cp -rf ${WORKSPACE}/data/logs/*tests*/target/*.xml ${WORKSPACE}/archives/
 
 ls -Rt ${WORKSPACE}/archives/
 
-#kill and remove all sdc dockers
+# kill and remove all sdc dockers
 docker stop $(docker ps -a -q --filter="name=sdc")
 docker rm $(docker ps -a -q --filter="name=sdc")
 
-
-#delete data folder
-
-#rm -rf ${WORKSPACE}/data/*
-
-
+# delete data folder
+sudo rm -rf ${WORKSPACE}/data/*

diff --git a/scripts/vid/kill_containers_and_remove_dataFolders.sh b/scripts/vid/kill_containers_and_remove_dataFolders.sh
index d7e0553..d3a900c 100644 (file)
--- a/scripts/vid/kill_containers_and_remove_dataFolders.sh
+++ b/scripts/vid/kill_containers_and_remove_dataFolders.sh
@@ -15,9 +15,10 @@
 # limitations under the License.
 #
 # Modifications copyright (c) 2017 AT&T Intellectual Property
+# Modifications copyright (c) 2019 Samsung Electronics Co., Ltd.
 #
 
-echo "This is ${WORKSPACE}/scripts/vid/kill_and_remove_dataFolder.sh"
+echo "This is ${WORKSPACE}/scripts/vid/kill_and_remove_dataFolders.sh"
 
 #kill and remove all vid dockers
 cd ${WORKSPACE}/tests/vid/resources