X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fdmaap-message-router%2Fdmaap-mr-teardown.sh;h=a8187d3ad0a2b5c08b8894be1a215ccd2fcb5c5b;hb=50c89f9872d724ed9a03b3a10485bfd7090a817d;hp=ac6d798c9fd70e09c34616f88cbccce02a282821;hpb=9abb61ca2cea1907cab2cec312d6dca6e53a93cd;p=integration%2Fcsit.git

diff --git a/scripts/dmaap-message-router/dmaap-mr-teardown.sh b/scripts/dmaap-message-router/dmaap-mr-teardown.sh
index ac6d798c..a8187d3a 100755
--- a/scripts/dmaap-message-router/dmaap-mr-teardown.sh
+++ b/scripts/dmaap-message-router/dmaap-mr-teardown.sh
@@ -18,7 +18,14 @@
 #
 
 function dmaap_mr_teardown() {
-kill-instance.sh docker-compose_dmaap_1 
-kill-instance.sh docker-compose_kafka_1 
-kill-instance.sh docker-compose_zookeeper_1
+#
+# the default prefix for docker containers is the directory name containing the docker-compose.yml file.
+# It can be over-written by an env variable COMPOSE_PROJECT_NAME.  This env var seems to be set in the Jenkins CSIT environment
+COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-dockercompose}
+COMPOSE_PROJECT_NAME=$COMPOSE_PREFIX
+echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
+echo "COMPOSE_PREFIX=$COMPOSE_PREFIX"
+kill-instance.sh ${COMPOSE_PREFIX}_dmaap_1 
+kill-instance.sh ${COMPOSE_PREFIX}_kafka_1 
+kill-instance.sh ${COMPOSE_PREFIX}_zookeeper_1
 }