workflows: check status of Relay port-forward

Since we start a background process for port-forwarding Relay, we must check if it actually succeeded or failed before allowing workflows to continue. We also standardize a 10s allowance time for port-forward to start. Signed-off-by: Nicolas Busseneau <[email protected]>
cilium · Jul 2, 2021 · e56619b · e56619b
1 parent 8d0139b
commit e56619b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.github/in-cluster-test-scripts/eks-tunnel.sh b/.github/in-cluster-test-scripts/eks-tunnel.sh
@@ -12,6 +12,7 @@ cilium status --wait
 # Port forward Relay
 cilium hubble port-forward&
 sleep 10s
+[[ $(pgrep -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay" | wc -l) == 2 ]]
 
 # Run connectivity test
 cilium connectivity test --all-flows

diff --git a/.github/in-cluster-test-scripts/eks.sh b/.github/in-cluster-test-scripts/eks.sh
@@ -12,6 +12,7 @@ cilium status --wait
 # Port forward Relay
 cilium hubble port-forward&
 sleep 10s
+[[ $(pgrep -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay" | wc -l) == 2 ]]
 
 # Run connectivity test
 cilium connectivity test --all-flows

diff --git a/.github/in-cluster-test-scripts/gke.sh b/.github/in-cluster-test-scripts/gke.sh
@@ -18,6 +18,7 @@ cilium status --wait
 # Port forward Relay
 cilium hubble port-forward&
 sleep 10s
+[[ $(pgrep -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay" | wc -l) == 2 ]]
 
 # Run connectivity test
 cilium connectivity test --all-flows

diff --git a/.github/workflows/aks.yaml b/.github/workflows/aks.yaml
@@ -109,7 +109,8 @@ jobs:
       - name: Port forward Relay
         run: |
           cilium hubble port-forward&
-          sleep 5s
+          sleep 10s
+          [[ $(pgrep -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay" | wc -l) == 2 ]]
 
       - name: Run connectivity test
         run: |

diff --git a/.github/workflows/kind.yaml b/.github/workflows/kind.yaml
@@ -60,7 +60,8 @@ jobs:
       - name: Relay Port Forward
         run: |
           cilium hubble port-forward&
-          sleep 5s
+          sleep 10s
+          [[ $(pgrep -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay" | wc -l) == 2 ]]
 
       - name: Connectivity Test
         run: |
@@ -87,7 +88,8 @@ jobs:
           pkill -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay"
           sleep 1s
           cilium hubble port-forward&
-          sleep 5s
+          sleep 10s
+          [[ $(pgrep -f "cilium hubble port-forward|kubectl port-forward.*hubble-relay" | wc -l) == 2 ]]
 
       - name: Connectivity test
         run: |