From fd85955b9be8d56cef3c85b46c1f03bffe469165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCchse?= Date: Wed, 17 Jun 2026 09:48:29 +0200 Subject: [PATCH 1/2] Make sonobuoy handler more robust MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - do blanket cleaup before run, so leftovers don't interfere - output ABORT result in case of, well, an abort - divert sonobuoy stdout to stderr because! Signed-off-by: Matthias Büchse --- Tests/kaas/sonobuoy_handler/sonobuoy_handler.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py b/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py index a49399dc8..ffb305b87 100644 --- a/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py +++ b/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py @@ -6,6 +6,7 @@ import shlex import shutil import subprocess +import sys import yaml @@ -65,7 +66,7 @@ def _invoke_sonobuoy(self, *args, **kwargs): inv_args = (self.sonobuoy, "--kubeconfig", self.kubeconfig_path) + args logger.debug(f'invoking {" ".join(inv_args)}') # we had capture_output=True, but I don't see why -- let the caller decide - return subprocess.run(args=inv_args, check=True, **kwargs) + return subprocess.run(args=inv_args, check=True, stdout=sys.stderr, **kwargs) def _sonobuoy_run(self): self._invoke_sonobuoy("run", "--wait", *self.args) @@ -113,13 +114,15 @@ def run(self): logger.info(f"running sonobuoy for testcase {self.check_name}") self._preflight_check() try: + self._sonobuoy_delete() # remove leftovers from previous run, if any self._sonobuoy_run() counter = self._sonobuoy_retrieve_result() return_code = self._eval_result(counter) print(self.check_name + ": " + ("PASS", "FAIL")[min(1, return_code)]) return return_code except BaseException: - logger.exception("something went wrong") + print(self.check_name + ": ABORT") + logger.debug("something went wrong", exc_info=True) return 112 finally: self._sonobuoy_delete() From c4b3b874e5537ab6c20a9e5ae87585ca0258ff0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCchse?= Date: Wed, 17 Jun 2026 09:57:15 +0200 Subject: [PATCH 2/2] Fix logging channel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthias Büchse --- Tests/kaas/sonobuoy_handler/sonobuoy_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py b/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py index ffb305b87..96575173c 100644 --- a/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py +++ b/Tests/kaas/sonobuoy_handler/sonobuoy_handler.py @@ -122,7 +122,7 @@ def run(self): return return_code except BaseException: print(self.check_name + ": ABORT") - logger.debug("something went wrong", exc_info=True) + logger.critical("something went wrong", exc_info=True) return 112 finally: self._sonobuoy_delete()