Fix intermittent stall failure on slem

os-autoinst · Dec 26, 2024 · 5ea3f97 · 5ea3f97
1 parent b2e274e
commit 5ea3f97
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/lib/virt_autotest/kubevirt_utils.pm b/lib/virt_autotest/kubevirt_utils.pm
@@ -16,11 +16,24 @@ use strict;
 use warnings;
 use testapi;
 use utils;
+use version_utils qw(is_transactional);
+use bootloader_setup qw(change_grub_config);
 
 our @EXPORT = qw(
+  set_grub_timeout
   install_cni_plugins
 );
 
+sub set_grub_timeout {
+    my $grub_timeout = shift // 30;
+
+    if (is_transactional) {
+        change_grub_config('=.*', '=' . $grub_timeout, 'GRUB_TIMEOUT');
+        record_info('GRUB', script_output('cat /etc/default/grub'));
+        assert_script_run('transactional-update grub.cfg');
+    }
+}
+
 sub install_cni_plugins {
     # Setup cnv-bridge containernetworking plugin: one of the tests requires
     # a newer version of the Linux bridge CNI:

diff --git a/tests/virt_autotest/kubevirt_tests_agent.pm b/tests/virt_autotest/kubevirt_tests_agent.pm
@@ -25,6 +25,7 @@ sub run {
 
     if (check_var('RUN_TEST_ONLY', 0)) {
         use_ssh_serial_console;
+        $self->set_grub_timeout();
 
         # Synchronize the server & agent node before setup
         barrier_wait('kubevirt_test_setup');

diff --git a/tests/virt_autotest/kubevirt_tests_server.pm b/tests/virt_autotest/kubevirt_tests_server.pm
@@ -72,6 +72,7 @@ sub run {
 
     if (check_var('RUN_TEST_ONLY', 0)) {
         use_ssh_serial_console;
+        $self->set_grub_timeout();
 
         # Synchronize the server & agent node before setup
         barrier_wait('kubevirt_test_setup');