normalize deployment test scripts

Author: qrkourier

dist/dist-packages/linux/linux.test.bash

@@ -182,18 +182,26 @@ else
     exit 1
 fi
 
+export \
 ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
-ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
-go test -v -count=1 -tags="quickstart manual" ./ziti/run/...
+ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT}
+
+_test_result=$(go test -v -count=1 -tags="quickstart manual" ./ziti/run/...)
+
+# check for failure modes that don't result in an error exit code
+if [[ "${_test_result}" =~ "no tests to run" ]]
+then
+    echo "ERROR: test failed because no tests to run"
+    exit 1
+fi
 
 ATTEMPTS=5
 DELAY=3
 
 # verify console is available
 curl_cmd="curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null \"https://${ZITI_CTRL_ADVERTISED_ADDRESS}:${ZITI_CTRL_ADVERTISED_PORT}/zac/\""
-until ! ((ATTEMPTS)) || eval "${curl_cmd}" &> /dev/null
+until ! (( ATTEMPTS-- )) || eval "${curl_cmd}" &> /dev/null
 do
-    (( ATTEMPTS-- ))
     echo "Waiting for zac"
     sleep ${DELAY}
 done

dist/docker-images/docker.test.bash

@@ -124,18 +124,26 @@ ziti edge create edge-router "${ZITI_ROUTER_NAME}" -to ~ziggy/.config/ziti/"${ZI
 docker compose up ziti-router --detach
 
 unset GOOS
+export \
 ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
-ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
-go test -v -count=1 -tags="quickstart manual" ./ziti/run/...
+ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT}
+
+_test_result=$(go test -v -count=1 -tags="quickstart manual" ./ziti/run/...)
+
+# check for failure modes that don't result in an error exit code
+if [[ "${_test_result}" =~ "no tests to run" ]]
+then
+    echo "ERROR: test failed because no tests to run"
+    exit 1
+fi
 
 ATTEMPTS=5
 DELAY=3
 
 # verify console is available
 curl_cmd="curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null \"https://${ZITI_CTRL_ADVERTISED_ADDRESS}:${ZITI_CTRL_ADVERTISED_PORT}/zac/\""
-until ! ((ATTEMPTS)) || eval "${curl_cmd}" &> /dev/null
+until ! (( ATTEMPTS-- )) || eval "${curl_cmd}" &> /dev/null
 do
-    (( ATTEMPTS-- ))
     echo "Waiting for zac"
     sleep ${DELAY}
 done

dist/docker-images/k8s.test.bash

@@ -128,9 +128,10 @@ bash -x ./quickstart/kubernetes/miniziti.bash start \
 --values-dir "${EXTRA_VALUES_DIR}"
 
 MINIKUBE_IP="$(minikube --profile "${ZITI_NAMESPACE}" ip)"
+ZITI_CTRL_ADVERTISED_ADDRESS="miniziti-controller.${MINIKUBE_IP}.sslip.io"
 
 # verify console is available
-curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null "https://miniziti-controller.${MINIKUBE_IP}.sslip.io/zac/"
+curl -skSfw '%{http_code}\t%{url}\n' -o/dev/null "https://${ZITI_CTRL_ADVERTISED_ADDRESS}:${ZITI_CTRL_ADVERTISED_PORT}/zac/"
 
 ZITI_PWD=$(
     minikube kubectl --profile "${ZITI_NAMESPACE}" -- \
@@ -140,14 +141,21 @@ ZITI_PWD=$(
         --output go-template='{{index .data "admin-password" | base64decode }}'
 )
 
+
 export \
 ZITI_PWD \
 ZITI_ROUTER_NAME="miniziti-router" \
-ZITI_CTRL_ADVERTISED_ADDRESS="miniziti-controller.${MINIKUBE_IP}.sslip.io"
-
-ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS} \
-ZITI_CTRL_EDGE_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT} \
-ZITI_TEST_BIND_ADDRESS="ziti-controller-client.${ZITI_NAMESPACE}.svc.cluster.local" \
-go test -v -count=1 -tags="quickstart manual" ./ziti/run/...
+ZITI_CTRL_EDGE_ADVERTISED_ADDRESS="${ZITI_CTRL_ADVERTISED_ADDRESS}" \
+ZITI_CTRL_EDGE_ADVERTISED_PORT="${ZITI_CTRL_ADVERTISED_PORT}" \
+ZITI_TEST_BIND_ADDRESS="ziti-controller-client.${ZITI_NAMESPACE}.svc.cluster.local"
+
+_test_result=$(go test -v -count=1 -tags="quickstart manual" ./ziti/run/...)
+
+# check for failure modes that don't result in an error exit code
+if [[ "${_test_result}" =~ "no tests to run" ]]
+then
+    echo "ERROR: test failed because no tests to run"
+    exit 1
+fi
 
 cleanup