aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-27 17:17:39 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-27 17:17:39 +0000
commite161173e279a73134dda4c2f429605d6c9ee1fe7 (patch)
tree6e08c32016d241e81dd650e772a173fb2063fc1a
parentb20b090f7c4fbacbfc763200e3e98a5bd97507e2 (diff)
parent4eb863b7accef5f5cf1fc8cceaa0b4571ef3f683 (diff)
Merge "honor COMPOSE_PROJECT_NAME if set as docker prefix"
-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