From 18eb8c45334ba60278a8f08f579d3b87cb57b845 Mon Sep 17 00:00:00 2001 From: Conor Ward Date: Fri, 19 Oct 2018 14:21:17 +0100 Subject: [PATCH] Change location of docker-compose Change-Id: If59e8a032c3ae60fb5601fe113d30378b13d3721 Signed-off-by: Conor Ward Issue-ID: DMAAP-847 --- plans/dmaap-datarouter/dr-suite/setup.sh | 4 ++-- plans/dmaap-datarouter/dr-suite/teardown.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plans/dmaap-datarouter/dr-suite/setup.sh b/plans/dmaap-datarouter/dr-suite/setup.sh index 023e2658..dedf15b0 100755 --- a/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/plans/dmaap-datarouter/dr-suite/setup.sh @@ -9,7 +9,7 @@ cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master cd datarouter git pull -cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources sed -i 's/10003/10001/g' docker-compose.yml # start DMaaP DR containers with docker compose and configuration from docker-compose.yml @@ -17,7 +17,7 @@ docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb -for i in {1..50}; do +for i in {1..10}; do if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] diff --git a/plans/dmaap-datarouter/dr-suite/teardown.sh b/plans/dmaap-datarouter/dr-suite/teardown.sh index 033a0015..8e568691 100755 --- a/plans/dmaap-datarouter/dr-suite/teardown.sh +++ b/plans/dmaap-datarouter/dr-suite/teardown.sh @@ -1,4 +1,4 @@ #!/bin/bash -cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources docker-compose down -v -- 2.16.6