Fix sonobouy tests on v1.25

Use --disable instead of --no-deploy, and don't silently succeed if sonobouy never runs

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

scripts/test-setup-sonobuoy

@@ -2,7 +2,7 @@
 
 export NUM_SERVERS=1
 export NUM_AGENTS=1
-export SERVER_ARGS='--no-deploy=traefik'
+export SERVER_ARGS='--disable=traefik'
 export WAIT_SERVICES='coredns local-path-provisioner metrics-server'
 
 export sonobuoyParallelArgs=(--e2e-focus='\[Conformance\]' --e2e-skip='\[Serial\]' --e2e-parallel=y)
@@ -14,10 +14,10 @@ start-test() {
 export -f start-test
 
 test-post-hook() {
-  if [[ $1 -eq 0 ]]; then
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
-    return
+    return $1
   fi
-  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
+  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
   # Ignore sonobuoy failures if only these flaky tests have failed
   flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
   totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )

scripts/test-setup-sonobuoy-etcd

@@ -15,10 +15,10 @@ server-post-hook() {
 export -f server-post-hook
 
 test-post-hook() {
-  if [[ $1 -eq 0 ]]; then
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
-    return
+    return $1
   fi
-  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
+  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
   # Ignore sonobuoy failures if only these flaky tests have failed
   flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
   totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )

scripts/test-setup-sonobuoy-mysql

@@ -42,10 +42,10 @@ cluster-pre-hook() {
 export -f cluster-pre-hook
 
 test-post-hook() {
-  if [[ $1 -eq 0 ]]; then
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
-    return
+    return $1
   fi
-  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
+  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
   # Ignore sonobuoy failures if only these flaky tests have failed
   flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
   totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )

scripts/test-setup-sonobuoy-postgres

@@ -42,10 +42,10 @@ cluster-pre-hook() {
 export -f cluster-pre-hook
 
 test-post-hook() {
-  if [[ $1 -eq 0 ]]; then
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
-    return
+    return $1
   fi
-  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR"/sonobuoy/plugins/e2e/results/global/e2e.log)
+  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
   # Ignore sonobuoy failures if only these flaky tests have failed
   flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
   totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )