X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=csit%2Fscripts%2Fdmaap-datarouter%2Fdatarouter-teardown.sh;h=f54f84244ba00a4d9d9b92a1ffe3998f030ac0a8;hb=bda6aeaa60607ab4fe5af508156019d7bd5c0ce4;hp=8958f28cef61eb0434c64c9ea2a789ecf90676f5;hpb=b37d32a39c7096e39fc389f15d150e8c2b8c54c2;p=dmaap%2Fdatarouter.git

diff --git a/csit/scripts/dmaap-datarouter/datarouter-teardown.sh b/csit/scripts/dmaap-datarouter/datarouter-teardown.sh
index 8958f28c..f54f8424 100755
--- a/csit/scripts/dmaap-datarouter/datarouter-teardown.sh
+++ b/csit/scripts/dmaap-datarouter/datarouter-teardown.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ============LICENSE_START===================================================
-#  Copyright (C) 2019-2021 Nordix Foundation.
+#  Copyright (C) 2019-2022 Nordix Foundation.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,16 +18,15 @@
 # ============LICENSE_END=====================================================
 
 function teardown_dmaap_dr (){
-    cd ${WORKSPACE}/archives/dmaap/dr
+    # shellcheck disable=SC2164
+    cd "${WORKSPACE}"/archives/dmaap/dr
     rm -rf last_run_logs/*
     docker cp datarouter-prov:/opt/app/datartr/logs last_run_logs/prov_logs
     docker cp datarouter-node:/opt/app/datartr/logs last_run_logs/node_event_logs
     docker cp datarouter-node:/var/log/onap/datarouter last_run_logs/node_server_logs
-    docker cp subscriber-node:/var/log/onap/datarouter last_run_logs/sub1_logs
-    docker cp subscriber-node2:/var/log/onap/datarouter last_run_logs/sub2_logs
+    docker cp subscriber-node:/var/log/onap/subscriber last_run_logs/sub1_logs
+    docker cp subscriber-node2:/var/log/onap/subscriber last_run_logs/sub2_logs
     sudo sed -i".bak" '/dmaap-dr-prov/d' /etc/hosts
     sudo sed -i".bak" '/dmaap-dr-node/d' /etc/hosts
-    docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml rm -sf
-    cd ${WORKSPACE}/scripts/dmaap-datarouter/robot_ssl
-    python -c 'import update_ca; update_ca.remove_onap_ca_cert()'
+    docker-compose -f "${WORKSPACE}"/scripts/dmaap-datarouter/docker-compose/docker-compose.yml rm -sf
 }
\ No newline at end of file