diff options
| author |   Dominic Lunanuova <dgl@research.att.com> | 2018-10-01 20:21:48 +0000 |
|---|---|---|
| committer | Dominic Lunanuova <dgl@research.att.com> | 2018-10-01 20:21:54 +0000 |
| commit | c078eea2b2809a22aad21f1b4f8c49d018ece7b6 (patch) | |
| tree | 6192a879d019bca065fa2e5548b00a9767ddbf86 | |
| parent | 7b6c8de1c0e2172db475611bfcce7d2df272eaea (diff) | |
Use default docker prefix of CSIT env
Change-Id: I9823414e7a984fac98981b8c364628290eeb0707
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Issue-ID: DMAAP-827
| -rwxr-xr-x | scripts/dmaap-message-router/dmaap-mr-launch.sh | 3 | ||||
| -rwxr-xr-x | scripts/dmaap-message-router/dmaap-mr-teardown.sh | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/scripts/dmaap-message-router/dmaap-mr-launch.sh b/scripts/dmaap-message-router/dmaap-mr-launch.sh index 36d31689..a4bd623a 100755 --- a/scripts/dmaap-message-router/dmaap-mr-launch.sh +++ b/scripts/dmaap-message-router/dmaap-mr-launch.sh @@ -34,7 +34,8 @@ function dmaap_mr_launch() { # # 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} + COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-dockercompose} + export COMPOSE_PROJECT_NAME=$COMPOSE_PREFIX echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME" echo "COMPOSE_PREFIX=$COMPOSE_PREFIX" 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 } |