From: kaihlavi Date: Tue, 11 Jun 2019 07:47:17 +0000 (+0300) Subject: Remove data folder in CSIT teardown X-Git-Tag: 6.0.0-ONAP~254^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d8547ef9e40448519fc48c1e1b8498cc8ef87b33;p=integration%2Fcsit.git 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 Change-Id: I91f031c74e7ae05ec4645677ec8c07b34ed28c0b --- 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