summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDominic Lunanuova <dgl@research.att.com>2018-09-27 17:10:42 +0000
committerDominic Lunanuova <dgl@research.att.com>2018-09-27 17:10:50 +0000
commit4eb863b7accef5f5cf1fc8cceaa0b4571ef3f683 (patch)
tree959aed92b25b96fbce21345d3a8dc804ec2ce2c7 /test
parentb4c9fdb2aca5d283e16354c488460252c68c7d67 (diff)
honor COMPOSE_PROJECT_NAME if set as docker prefix
Change-Id: I931b1f62039060df20914acc5a182a8498f9aa21 Signed-off-by: Dominic Lunanuova <dgl@research.att.com> Issue-ID: DMAAP-827
Diffstat (limited to 'test')
-rwxr-xr-xtest/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh b/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh
index 64f1720b6..36d316890 100755
--- a/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh
+++ b/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh
@@ -31,7 +31,13 @@ source ${SCRIPTS}/common_functions.sh
# (kafka and zk containers are not called externally)
function dmaap_mr_launch() {
- COMPOSE_PREFIX=docker-compose
+ #
+ # 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:-docker-compose}
+ echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
+ echo "COMPOSE_PREFIX=$COMPOSE_PREFIX"
+
# Clone DMaaP Message Router repo
mkdir -p $WORKSPACE/archives/dmaapmr
cd $WORKSPACE/archives/dmaapmr