Skip to content

Commit a5c84c8

Browse files
authored
Bugfix: extend timeout for kaas test; don't swallow Sonobuoy progress (#929)
Signed-off-by: Matthias Büchse <[email protected]>
1 parent 189136a commit a5c84c8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.zuul.d/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
# timeout:
6363
# a) these tests take a lot of time, I'm afraid, particularly Sonobuoy
6464
# b) keep in mind that this job covers ALL test subjects (at most 4 in parallel)
65-
timeout: 7200
65+
timeout: 9000
6666
vars:
6767
preset: kaas
6868
iaas: false

Tests/kaas/sonobuoy_handler/sonobuoy_handler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ def __init__(
5454
def _invoke_sonobuoy(self, *args, **kwargs):
5555
inv_args = (self.sonobuoy, "--kubeconfig", self.kubeconfig_path) + args
5656
logger.debug(f'invoking {" ".join(inv_args)}')
57-
return subprocess.run(args=inv_args, capture_output=True, check=True, **kwargs)
57+
# we had capture_output=True, but I don't see why -- let the caller decide
58+
return subprocess.run(args=inv_args, check=True, **kwargs)
5859

5960
def _sonobuoy_run(self):
6061
self._invoke_sonobuoy("run", "--wait", *self.args)
@@ -63,7 +64,7 @@ def _sonobuoy_delete(self):
6364
self._invoke_sonobuoy("delete", "--wait")
6465

6566
def _sonobuoy_status_result(self):
66-
process = self._invoke_sonobuoy("status", "--json")
67+
process = self._invoke_sonobuoy("status", "--json", capture_output=True)
6768
json_data = json.loads(process.stdout)
6869
counter = Counter()
6970
for entry in json_data["plugins"]:

0 commit comments

Comments
 (0)