X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdmaap-buscontroller%2Fwith_dr%2Fteardown.sh;fp=plans%2Fdmaap-buscontroller%2Fwith_dr%2Fteardown.sh;h=5e8014238bf7ea3b1e03ea62774ab06396eded97;hb=3d202b5a5f14587852e8519def7a07c4ca477686;hp=c7a2d6d8a1cdb665100daa2e59a9d05e5a8f0142;hpb=1acefd84302a7ffa1981a270a7a8a2f17f71c271;p=integration%2Fcsit.git

diff --git a/plans/dmaap-buscontroller/with_dr/teardown.sh b/plans/dmaap-buscontroller/with_dr/teardown.sh
index c7a2d6d8..5e801423 100755
--- a/plans/dmaap-buscontroller/with_dr/teardown.sh
+++ b/plans/dmaap-buscontroller/with_dr/teardown.sh
@@ -18,9 +18,17 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-if [ "$KEEP_DMAAP" != "Y" ]
-then
-kill-instance.sh dmaapbc
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources
-docker-compose down -v
-fi
+#kill-instance.sh dmaapbc
+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 dmaap-bc:/opt/app/dmaapbc/logs/ONAP last_run_logs/bc_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
+docker-compose -f ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml rm -sf