diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-19 13:57:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-19 13:57:42 +0000 |
| commit | 23bfc64539a212ad81ae62a1b5528799c6262771 (patch) | |
| tree | d1963f2d2127df33e2ef73baab54c8881d01439e /plans | |
| parent | dff4368ec33b87949935d2561acf9b55bd69aabc (diff) | |
| parent | 18eb8c45334ba60278a8f08f579d3b87cb57b845 (diff) | |
Merge "Change location of docker-compose"
Diffstat (limited to 'plans')
| -rwxr-xr-x | plans/dmaap-datarouter/dr-suite/setup.sh | 4 | ||||
| -rwxr-xr-x | 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 |