Merge "Pull correct docker images for master branch"

1 files changed, 15 insertions, 7 deletions

diff --git a/plans/policy/distribution/setup.sh b/plans/policy/distribution/setup.sh
index 40a15d12..a7c0a8da 100644
--- a/plans/policy/distribution/setup.sh
+++ b/plans/policy/distribution/setup.sh
@@ -16,16 +16,24 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Select branch
+source ${SCRIPTS}/policy/config/policy-csit.conf
+echo ${GERRIT_BRANCH}
 
-docker run -d --name policy-distribution -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-distribution:2.1.0-SNAPSHOT-latest
+sudo apt-get -y install libxml2-utils
+export POLICY_DISTRIBUTION_VERSION="$(curl -q --silent https://git.onap.org/policy/distribution/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)"
+echo ${POLICY_DISTRIBUTION_VERSION}
+docker run -d --name policy-distribution -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
 
 POLICY_DISTRIBUTION_IP=`get-instance-ip.sh policy-distribution`
 echo DISTRIBUTION IP IS ${POLICY_DISTRIBUTION_IP}
-# Wait for initialization
-for i in {1..10}; do
-   curl -sS ${POLICY_DISTRIBUTION_IP}:6969 && break
-   echo sleep $i
-   sleep $i
-done
+
+${SCRIPTS}/policy/wait_for_port.sh ${POLICY_DISTRIBUTION_IP} 6969
+rc=$?
+if [[ $rc != 0 ]]; then
+        echo "cannot open ${POLICY_DISTRIBUTION_IP} 6969"
+        docker logs policy-distribution
+        exit $rc
+fi
 
 ROBOT_VARIABLES="-v POLICY_DISTRIBUTION_IP:${POLICY_DISTRIBUTION_IP}"