Move wait_for to common.sh

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Idda7606b31ed0055d9cc22a679f5b60b18a1c0b8

diff --git a/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh b/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
index 8b18d33..433c26f 100755 (executable)
--- a/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
+++ b/cmd/bpa-operator/e2etest/bpa_bmh_verifier.sh
@@ -1,19 +1,14 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
+SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
+LIBDIR="$(dirname $(dirname $(dirname ${SCRIPTDIR})))/env/lib"
+
+source $LIBDIR/common.sh
+
 CLUSTER_NAME=test-bmh-cluster
 ADDONS_NAMESPACE=kud
 
-function wait_for {
-    local -r interval=30
-    for ((try=0;try<600;try+=${interval})); do
-        echo "$(date +%H:%M:%S) - Waiting for $*"
-        sleep ${interval}s
-        if $*; then return 0; fi
-    done
-    return 1
-}
-
 function emco_ready {
     KUBECONFIG=${CLUSTER_KUBECONFIG} kubectl -n emco wait pod --all --for=condition=Ready --timeout=0s 1>/dev/null 2>/dev/null
 }

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 78f4c12..7ec65c5 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -110,3 +110,17 @@ function node_networkdata {
 
     cat $NODES_FILE  | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net'
 }
+
+function wait_for {
+    local -r interval=${WAIT_FOR_INTERVAL:-30s}
+    local -r max_tries=${WAIT_FOR_TRIES:-20}
+    local try=0
+    until "$@"; do
+        echo "[${try}/${max_tries}] - Waiting ${interval} for $*"
+        sleep ${interval}
+        try=$((try+1))
+        if [[ ${try} -ge ${max_tries} ]]; then
+            return 1
+        fi
+    done
+}