diff options
| -rwxr-xr-x | plans/dmaap/mrpubsub/setup.sh | 54 | ||||
| -rwxr-xr-x | plans/dmaap/mrpubsub/teardown.sh | 5 |
2 files changed, 5 insertions, 54 deletions
diff --git a/plans/dmaap/mrpubsub/setup.sh b/plans/dmaap/mrpubsub/setup.sh index 5a670d28..c2c9b133 100755 --- a/plans/dmaap/mrpubsub/setup.sh +++ b/plans/dmaap/mrpubsub/setup.sh @@ -21,57 +21,9 @@ # =================================================================== # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -# Place the scripts in run order: -source ${SCRIPTS}/common_functions.sh - -# Clone DMaaP Message Router repo -mkdir -p $WORKSPACE/archives/dmaapmr -cd $WORKSPACE/archives/dmaapmr -#unset http_proxy https_proxy -git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master -git pull -cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose -cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ - - - -# Update kafkfa and zookeeper properties in MsgRtrApi.propeties which will be copied to DMaaP Container -sed -i -e 's/<zookeeper_host>/zookeeper/' /var/tmp/MsgRtrApi.properties -sed -i -e 's/<kafka_host>:<kafka_port>/kafka:9092/' /var/tmp/MsgRtrApi.properties - -# start DMaaP MR containers with docker compose and configuration from docker-compose.yml -docker-compose build -docker login -u docker -p docker nexus3.onap.org:10001 -docker-compose up -d - -# Wait for initialization of Docker containers -for i in {1..50}; do - if [ $(docker inspect --format '{{ .State.Running }}' dockercompose_dmaap_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' dockercompose_zookeeper_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' dockercompose_dmaap_1) ] - then - echo "DMaaP Service Running" - break - else - echo sleep $i - sleep $i - fi -done - -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_dmaap_1) -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_kafka_1) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_zookeeper_1) - -echo DMAAP_MR_IP=${DMAAP_MR_IP} -echo KAFKA_IP=${KAFKA_IP} -echo ZOOKEEPER_IP=${ZOOKEEPER_IP} - -# Wait for initialization of docker services -for i in {1..50}; do - curl -sS -m 1 ${DMAAP_MR_IP}:3904/events/TestTopic && break - echo sleep $i - sleep $i -done +source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh +dmaap_mr_launch +DMAAP_MR_IP=${IP} #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v DMAAP_MR_IP:${DMAAP_MR_IP}" diff --git a/plans/dmaap/mrpubsub/teardown.sh b/plans/dmaap/mrpubsub/teardown.sh index 1b430324..4758163d 100755 --- a/plans/dmaap/mrpubsub/teardown.sh +++ b/plans/dmaap/mrpubsub/teardown.sh @@ -17,6 +17,5 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -kill-instance.sh dockercompose_dmaap_1 -kill-instance.sh dockercompose_kafka_1 -kill-instance.sh dockercompose_zookeeper_1 +source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-teardown.sh +dmaap_mr_teardown |