From a860efeb2ff3c0e6cb4d5af9d7d141cf3b6ea968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Fri, 19 May 2023 08:14:04 +0200 Subject: [PATCH 1/2] Increase timeout when ssh-ing to guest on profile apply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On some machines the 60s default timeout is not enough. Signed-off-by: Lukáš Doktor --- runperf/profiles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runperf/profiles.py b/runperf/profiles.py index c3350c6..109d13b 100644 --- a/runperf/profiles.py +++ b/runperf/profiles.py @@ -487,7 +487,7 @@ def _apply(self, setup_script): ret = self._start_vms() # Make sure vms are accessible for vm in self.vms: - with vm.get_session_cont() as session: + with vm.get_session_cont(timeout=360) as session: session.cmd("true") self._set("applied_profile", self.name) return ret From f0e3e8b6f611839059dedfbac87d247b9b793ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= Date: Fri, 19 May 2023 08:15:28 +0200 Subject: [PATCH 2/2] Bisect should return the RET3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The RET contains the first failure. When both failures match, it's not a problem, but when the third matches the second, we would report incorrect return code. Signed-off-by: Lukáš Doktor --- contrib/bisect.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/bisect.sh b/contrib/bisect.sh index 479cf44..f925bf5 100755 --- a/contrib/bisect.sh +++ b/contrib/bisect.sh @@ -146,6 +146,7 @@ case $1 in move_result $RET3 1 move_result $RET3 2 move_result $RET3 + RET=$RET3 fi else # Just use this result