diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-03-15 15:54:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-15 15:54:08 +0000 |
| commit | 1393fc2533cae1271126498f1661dec893922dae (patch) | |
| tree | 5bcd509e6ae1a7aa2fa1bd35f44b738ff377f9e0 /test/csit/plans/aai/resources/setup.sh | |
| parent | 889f3a26a84d0d3f38efddfc71023ec814ef4d1f (diff) | |
| parent | 3918ac5200b6491599469463ceafb3638faa1b8c (diff) | |
Merge "Change from using chef to local config files"
Diffstat (limited to 'test/csit/plans/aai/resources/setup.sh')
| -rw-r--r-- | test/csit/plans/aai/resources/setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/csit/plans/aai/resources/setup.sh b/test/csit/plans/aai/resources/setup.sh index a4c7648c0..14b567108 100644 --- a/test/csit/plans/aai/resources/setup.sh +++ b/test/csit/plans/aai/resources/setup.sh @@ -26,6 +26,8 @@ DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) DOCKER_REGISTRY=${NEXUS_DOCKER_REPO} DOCKER_IMAGE_VERSION=1.2-STAGING-latest +export CURRENT_PWD=$(pwd); + function wait_for_container() { CONTAINER_NAME="$1"; @@ -101,7 +103,7 @@ else fi; RESOURCES_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1); -wait_for_container ${RESOURCES_CONTAINER_NAME} '0.0.0.0:8447'; +wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started'; docker logs ${RESOURCES_CONTAINER_NAME}; |