diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-04-15 16:11:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-15 16:11:11 +0000 |
| commit | fb17bcfe684ca3dd0995b801ca21f9de4d8b6d8b (patch) | |
| tree | 7355a74f9ce240def885aa213446805d4b2fb6ce /plans/policy/api | |
| parent | 5124ab5b8dad3dff35da2ceec74ca0e2645117e6 (diff) | |
| parent | 95097c2a4d7f3ecbc22b01f7aad69736d49beb02 (diff) | |
Merge "DB Connection Setup for API and PAP for CSIT"
Diffstat (limited to 'plans/policy/api')
| -rw-r--r-- | plans/policy/api/setup.sh | 23 | ||||
| -rwxr-xr-x[-rw-r--r--] | plans/policy/api/teardown.sh | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/plans/policy/api/setup.sh b/plans/policy/api/setup.sh index b7d31bb5..a29254a5 100644 --- a/plans/policy/api/setup.sh +++ b/plans/policy/api/setup.sh @@ -17,15 +17,36 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= -docker run -d --name policy-api -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-api:2.0.0-SNAPSHOT-latest +echo "Uninstall docker-py and reinstall docker." +pip uninstall -y docker-py +pip uninstall -y docker +pip install -U docker==2.7.0 + +# Adding this waiting container to avoid race condition between api and mariadb containers. +docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml run --rm start_dependencies +docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-api.yml up -d +sleep 3 POLICY_API_IP=`get-instance-ip.sh policy-api` +MARIADB_IP=`get-instance-ip.sh mariadb` + echo API IP IS ${POLICY_API_IP} +echo MARIADB IP IS ${MARIADB_IP} + # Wait for initialization for i in {1..10}; do + curl -sS ${MARIADB_IP}:3306 && break + echo sleep $i + sleep $i +done +for i in {1..10}; do curl -sS ${POLICY_API_IP}:6969 && break echo sleep $i sleep $i done +#Configure the database +docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh +docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh + ROBOT_VARIABLES="-v POLICY_API_IP:${POLICY_API_IP}" diff --git a/plans/policy/api/teardown.sh b/plans/policy/api/teardown.sh index 8683dedd..fc82dfa7 100644..100755 --- a/plans/policy/api/teardown.sh +++ b/plans/policy/api/teardown.sh @@ -18,3 +18,5 @@ # ============LICENSE_END========================================================= kill-instance.sh policy-api +kill-instance.sh mariadb +kill-instance.sh policy-wait |