diff options
| -rw-r--r-- | plans/aaf/aafapi/setup.sh | 16 | ||||
| -rw-r--r-- | plans/aaf/aafapi/teardown.sh | 2 | ||||
| -rw-r--r-- | scripts/optf-cmso/cmso/start_cmso_containers.sh | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh index 114cd7aa..6c88ceb7 100644 --- a/plans/aaf/aafapi/setup.sh +++ b/plans/aaf/aafapi/setup.sh @@ -116,19 +116,11 @@ docker images docker ps -a -docker logs aaf_hello +for C in aaf_service aaf_locate aaf_oauth aaf_cm aaf_gui aaf_hello aaf_fs; do + docker logs $C +done -docker logs aaf_locate - -docker logs aaf_cm - -docker logs aaf_gui - -docker logs aaf_fs - -docker logs aaf_oauth - -docker logs aaf_service +bash ./aaf.sh wait aaf_service AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_service) echo AAF_IP=${AAF_IP} diff --git a/plans/aaf/aafapi/teardown.sh b/plans/aaf/aafapi/teardown.sh index 957bb356..f80c3ad2 100644 --- a/plans/aaf/aafapi/teardown.sh +++ b/plans/aaf/aafapi/teardown.sh @@ -25,6 +25,6 @@ cd "$WORKSPACE/archives/opt/authz/auth/docker" bash dstop.sh bash dstop.sh cass echo "Y" | docker container prune -docker volume remove aaf_config aaf_cass_data +docker volume remove aaf_config aaf_cass_data aaf_status cd - diff --git a/scripts/optf-cmso/cmso/start_cmso_containers.sh b/scripts/optf-cmso/cmso/start_cmso_containers.sh index 10e0855d..ded86d7c 100644 --- a/scripts/optf-cmso/cmso/start_cmso_containers.sh +++ b/scripts/optf-cmso/cmso/start_cmso_containers.sh @@ -20,6 +20,9 @@ echo "This is ${WORKSPACE}/scripts/opft-cmso/cmso/start_cmso_containers.sh" +DB_IMAGE_VERSION=1.0-SNAPSHOT-latest +SERVICE_IMAGE_VERSION=1.0-SNAPSHOT-latest + # start cmso mariadb and db-init containers with docker compose and configuration from cmso/cmso-service/extra/docker/cmso-service/docker-compose.yml docker run -p 3306:3306 --name cmso-mariadb -v $(pwd)/mariadb/conf1:/etc/mysql/conf.d -e MYSQL_ROOT_PASSWORD=beer -d mariadb:10.1.11 @@ -32,11 +35,13 @@ sed -i -e "s%192.168.56.101:3306%${CMSO_DB_IP}:3306%g" ./etc/config/cmso.proper sed -i -e "s%192.168.56.101:3306%${CMSO_DB_IP}:3306%g" ./etc/config/liquibase.properties -docker run --name cmso-db-init -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs -d nexus3.onap.org:10001/onap/optf-cmso-dbinit +docker run --name cmso-db-init -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs \ + -d nexus3.onap.org:10001/onap/optf-cmso-dbinit:${DB_IMAGE_VERSION} sleep 30 -docker run --name cmso-service -p 8080:8080 -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs -v $(pwd)/debug-logs:/share/debug-logs -d nexus3.onap.org:10001/onap/optf-cmso-service +docker run --name cmso-service -p 8080:8080 -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs\ + -v $(pwd)/debug-logs:/share/debug-logs -d nexus3.onap.org:10001/onap/optf-cmso-service:${SERVICE_IMAGE_VERSION} CMSO_SERVICE_IP=`get-instance-ip.sh cmso-service` |