From 86d3686e6c81eade6cffeb3e75b82fe36952a6bb Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Tue, 1 Nov 2022 22:43:31 +0000
Subject: [PATCH] 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          | 10 +++++-----
 scripts/test-setup-sonobuoy-etcd     |  6 +++---
 scripts/test-setup-sonobuoy-mysql    |  6 +++---
 scripts/test-setup-sonobuoy-postgres |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/test-setup-sonobuoy b/scripts/test-setup-sonobuoy
index 57a07e9cfd..d86cc49a1b 100755
--- a/scripts/test-setup-sonobuoy
+++ b/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,13 +14,13 @@ start-test() {
 export -f start-test
 
 test-post-hook() {
-  if [[ $1 -eq 0 ]]; then
-    return
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
+    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" )
   [ "$totalFails" -le "$flakyFails" ]
 }
-export -f test-post-hook
\ No newline at end of file
+export -f test-post-hook
diff --git a/scripts/test-setup-sonobuoy-etcd b/scripts/test-setup-sonobuoy-etcd
index 83e27a00f4..b90dec30da 100644
--- a/scripts/test-setup-sonobuoy-etcd
+++ b/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
-    return
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
+    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" )
diff --git a/scripts/test-setup-sonobuoy-mysql b/scripts/test-setup-sonobuoy-mysql
index 438241e8c7..c8ae42c0db 100644
--- a/scripts/test-setup-sonobuoy-mysql
+++ b/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
-    return
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
+    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" )
diff --git a/scripts/test-setup-sonobuoy-postgres b/scripts/test-setup-sonobuoy-postgres
index 01ad61cb1c..4b7f794ed9 100644
--- a/scripts/test-setup-sonobuoy-postgres
+++ b/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
-    return
+  if [[ $1 -eq 0 ]] || [[ ! -f "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log" ]]; then
+    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" )