Improve nsc test order (#1710)

Author: n-g

.github/workflows/scripts/ns_cluster_tests.sh

@@ -49,37 +49,37 @@ tmux send-keys -t NsSSHSession "exit" Enter
 # Spawn an nginx pod to generate application logs.
 $NSC_BIN kubectl $CLUSTER_ID run nginx --image=nginx --restart=Never
 
-# Test ns cluster logs
+# Test nsc kubectl get pods -A
 s=1
-for i in $(seq 1 20); do
-    LOGS=$($NSC_BIN logs $CLUSTER_ID --all | wc -l)
-    if [[ $(($LOGS)) -gt 10 ]]; then
-        echo "Found cluster logs!"
+for i in $(seq 1 5); do
+    K_OUT=$($NSC_BIN kubectl $CLUSTER_ID get pods -A | wc -l)
+    if [[ $(($K_OUT)) -gt 0 ]]; then
+        echo "Found K8s pods!"
         s=0
         break
     fi
-    echo "Still no logs from cluster... (attempt $i, got $LOGS lines)"
+    echo "Still no pods from cluster..."
     sleep 5
 done
 if [[ $s -gt 0 ]]; then
-    echo "FAILED: no logs from $CLUSTER_ID."
+    echo "FAILED: no Kubernetes pods running on $CLUSTER_ID."
     exit 1
 fi
 
-# Test nsc kubectl get pods -A
+# Test ns cluster logs
 s=1
-for i in $(seq 1 5); do
-    K_OUT=$($NSC_BIN kubectl $CLUSTER_ID get pods -A | wc -l)
-    if [[ $(($K_OUT)) -gt 0 ]]; then
-        echo "Found K8s pods!"
+for i in $(seq 1 10); do
+    LOGS=$($NSC_BIN logs $CLUSTER_ID | wc -l)
+    if [[ $(($LOGS)) -gt 0 ]]; then
+        echo "Found cluster logs!"
         s=0
         break
     fi
-    echo "Still no pods from cluster..."
+    echo "Still no logs from cluster..."
     sleep 5
 done
 if [[ $s -gt 0 ]]; then
-    echo "FAILED: no Kubernetes pods running on $CLUSTER_ID."
+    echo "FAILED: no logs from $CLUSTER_ID."
     exit 1
 fi