From: LiamBurke Date: Tue, 16 Oct 2018 10:44:12 +0000 (+0000) Subject: Change dockercompose of message router X-Git-Tag: 3.0.0-ONAP~30 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration%2Fcsit.git;a=commitdiff_plain;h=ae583bed79389fe9a28b0b62c6fed215af4e0d63 Change dockercompose of message router Change-Id: Ie6d3a6d6f98b725b7d15b671da4b0c7ba32e2de7 Issue-ID: INT-649 Signed-off-by: LiamBurke --- diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 8dfcfe40..e409b52c 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -6,6 +6,7 @@ source ${SCRIPTS}/common_functions.sh mkdir -p $WORKSPACE/archives/dmaapmr cd $WORKSPACE/archives/dmaapmr git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master +sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ diff --git a/plans/usecases/5G-bulkpm/teardown.sh b/plans/usecases/5G-bulkpm/teardown.sh index 0c86623b..d72345e4 100644 --- a/plans/usecases/5G-bulkpm/teardown.sh +++ b/plans/usecases/5G-bulkpm/teardown.sh @@ -1,7 +1,8 @@ #!/bin/bash echo "Starting teardown script" -docker exec dfc /bin/sh -c "cat /opt/log/application.log" -sleep 5 +docker exec dfc /bin/sh -c "less /opt/log/application.log" > /tmp/dfc_docker.log +cat /tmp/dfc_docker.log +sleep 3 kill-instance.sh $DMAAP kill-instance.sh $KAFKA kill-instance.sh $ZOOKEEPER