diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2021-03-29 09:25:03 +0100 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2021-03-30 10:55:09 +0100 |
| commit | 3d202b5a5f14587852e8519def7a07c4ca477686 (patch) | |
| tree | e24ec636dbfb1af5518f0e91c929a759d960363c /scripts/dmaap-buscontroller/dmaapbc-launch.sh | |
| parent | 1acefd84302a7ffa1981a270a7a8a2f17f71c271 (diff) | |
[DMAAP] Refactoring dmaap suites
Remove dmaap-bc ssl suite
Remove 5gbulkpm as it runs in gating already
Update bc suite to use latest image
Issue-ID: DMAAP-1502
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I14146fe616a2da49b5dcf9b4c98f9976fc65a86f
Diffstat (limited to 'scripts/dmaap-buscontroller/dmaapbc-launch.sh')
| -rwxr-xr-x | scripts/dmaap-buscontroller/dmaapbc-launch.sh | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/scripts/dmaap-buscontroller/dmaapbc-launch.sh index 0a653fa1..3e446d89 100755 --- a/scripts/dmaap-buscontroller/dmaapbc-launch.sh +++ b/scripts/dmaap-buscontroller/dmaapbc-launch.sh @@ -4,34 +4,23 @@ # sets global var IP with assigned IP address function dmaapbc_launch() { - TAG="nexus3.onap.org:10001/onap/dmaap/buscontroller" - CONTAINER_NAME=dmaapbc - IP="" + export dmaap_prov_ip=$1 + export dmaap_mr_ip=$1 + cd ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose + docker-compose -f docker-compose-bc.yml up -d - cd ${WORKSPACE}/scripts/dmaap-buscontroller + sleep 10 - TMP_CFG=/tmp/docker-databus-controller.conf - . ./onapCSIT.env > $TMP_CFG - ADDHOSTS="" - if [ ! -z "$2" ] - then - ADDHOSTS="$ADDHOSTS --add-host=message-router:$2" - fi - if [ ! -z "$3" ] - then - ADDHOSTS="$ADDHOSTS --add-host=dmaap-dr-prov:$3" - fi - docker run -d $ADDHOSTS --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG - IP=`get-instance-ip.sh ${CONTAINER_NAME}` + DMAAP_BC_IP=`get-instance-ip.sh dmaap-bc` source ${SCRIPTS}/common_functions.sh - bypass_ip_adress ${IP} + bypass_ip_adress ${DMAAP_BC_IP} - # Wait for initialization - for i in {1..10}; do - curl -sS ${IP}:8080 && break - echo sleep $i - sleep $i - done + # Wait for initialization + for i in 1 2 3 4 5 6 7 8 9 10; do + curl -sS ${DMAAP_BC_IP}:8080 && break + echo sleep ${i} + sleep ${i} + done } |