aboutsummaryrefslogtreecommitdiffstats
path: root/plans/policy
diff options
context:
space:
mode:
Diffstat (limited to 'plans/policy')
-rw-r--r--plans/policy/api/setup.sh23
-rwxr-xr-x[-rw-r--r--]plans/policy/api/teardown.sh2
-rw-r--r--plans/policy/pap/setup.sh22
-rw-r--r--plans/policy/pap/teardown.sh2
4 files changed, 47 insertions, 2 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
diff --git a/plans/policy/pap/setup.sh b/plans/policy/pap/setup.sh
index 44a205a1..2d31b9c4 100644
--- a/plans/policy/pap/setup.sh
+++ b/plans/policy/pap/setup.sh
@@ -17,15 +17,35 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker run -d --name policy-pap -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-pap: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 due to race condition between pap and mariadb
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml run --rm start_dependencies
+docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-pap.yml up -d
+sleep 3
POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
+MARIADB_IP=`get-instance-ip.sh mariadb`
+
echo PAP IP IS ${POLICY_PAP_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_PAP_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_PAP_IP:${POLICY_PAP_IP}"
diff --git a/plans/policy/pap/teardown.sh b/plans/policy/pap/teardown.sh
index 877b164a..87986979 100644
--- a/plans/policy/pap/teardown.sh
+++ b/plans/policy/pap/teardown.sh
@@ -18,3 +18,5 @@
# ============LICENSE_END=========================================================
kill-instance.sh policy-pap
+kill-instance.sh mariadb
+kill-instance.sh policy-wait