test: fix Infinite loop during VM provisioning

Fixes: #16871 Signed-off-by: Gaurav Genani <h3llix.pvt@gmail.com>
cilium · Aug 11, 2021 · 9ab98fe · 9ab98fe
1 parent 2d075ea
commit 9ab98fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile
@@ -86,6 +86,10 @@ pipeline {
                 timeout(time: 150, unit: 'MINUTES')
             }
 
+            environment {
+                POLL_TIMEOUT_SECONDS=300
+            }
+
             steps {
                 sh 'cd ${TESTDIR}; vagrant ssh k8s1-${K8S_VERSION} -c "cd /home/vagrant/go/${PROJ_PATH}; sudo ./test/kubernetes-test.sh ${DOCKER_TAG}"'
             }

diff --git a/test/kubernetes-test.sh b/test/kubernetes-test.sh
@@ -32,16 +32,20 @@ helm template --validate install/kubernetes/cilium \
 
 kubectl apply -f cilium.yaml
 
-while true; do
-    result=$(kubectl -n kube-system get pods -l k8s-app=cilium | grep "Running" -c)
-    echo "Running pods ${result}"
-    if [ "${result}" == "2" ]; then
+runningPods="0"
 
-        echo "result match, continue with kubernetes"
-        break
-    fi
+pollCiliumPods () {
+  until [ "${runningPods}" == "2" ]; do
+    runningPods=$(kubectl -n kube-system get pods -l k8s-app=cilium | grep "Running" -c)
+    echo "Running Pods ${runningPods}"
     sleep 1
-done
+  done
+  echo "result match, continue with kubernetes"
+}
+
+export -f pollCiliumPods
+timeout ${POLL_TIMEOUT_SECONDS} bash -c pollCiliumPods
+unset pollCiliumPods
 
 set -e