From: jhh <jorge.hernandez-herrero@att.com>
Date: Mon, 29 Apr 2019 23:32:21 +0000 (-0500)
Subject: Bound wait time for a component's port
X-Git-Tag: 1.4.0~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=c9e7e93557b1fe7b244eacbf431e1131b39fc3e0

Bound wait time for a component's port

This should prevent the 90 minutes timeouts
in CSIT tests.

Change-Id: Ia9491462f4c3b83564584eb9f85551570e3c6342
Issue-ID: POLICY-1712
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---

diff --git a/packages/docker/src/main/docker/wait-for-port.sh b/packages/docker/src/main/docker/wait-for-port.sh
index befebf208..15c6eb8b4 100644
--- a/packages/docker/src/main/docker/wait-for-port.sh
+++ b/packages/docker/src/main/docker/wait-for-port.sh
@@ -25,14 +25,17 @@ if [[ $# -ne 2 ]]; then
 	exit 1
 fi
 
-host=$1
-port=$2
+export host=$1
+export port=$2
 
 echo "Waiting for $host port $port open"
-until nc -vz $host $port 2> /dev/null; do
-	sleep 1
-done
+timeout 120 bash -c 'until nc -vz "$host" "$port"; do echo -n "."; sleep 1; done'
+rc=$?
 
-echo "$host port $port is open"
+if [[ $rc != 0 ]]; then
+	echo "$host port $port cannot be reached"
+	exit $rc
+fi
 
+echo "$host port $port is open"
 exit 0