diff options
author | 2019-06-25 16:38:03 +0000 | |
---|---|---|
committer | 2019-06-25 16:38:03 +0000 | |
commit | b86374753af6cbad8feb6c98723e4cb8aab50c9c (patch) | |
tree | 27792931bed23d16be6992e6cd58b511f7a8bdb0 | |
parent | 67095045b9d7cb82c0e2f5cbd01d520cd64bff0f (diff) | |
parent | d8547ef9e40448519fc48c1e1b8498cc8ef87b33 (diff) |
Merge "Remove data folder in CSIT teardown"
-rw-r--r-- | scripts/sdc/kill_containers_and_remove_dataFolders.sh | 13 | ||||
-rw-r--r-- | scripts/vid/kill_containers_and_remove_dataFolders.sh | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/scripts/sdc/kill_containers_and_remove_dataFolders.sh b/scripts/sdc/kill_containers_and_remove_dataFolders.sh index f231a262..6cc47561 100644 --- 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 d7e05533..d3a900c9 100644 --- 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 |