Merge pull request os-autoinst#18032 from alvarocarvajald/team8684

Force sles4sap/hana_cluster test module to run on serial terminal
alvarocarvajald · Oct 20, 2023 · a661592 · a661592
2 parents d38d92b + e49f5da
commit a661592
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/schedule/sles4sap/hana/hana_cluster_node.yaml b/schedule/sles4sap/hana/hana_cluster_node.yaml
@@ -28,7 +28,6 @@ vars:
   BOOT_HDD_IMAGE: '1'
   USE_SUPPORT_SERVER: '1'
   HDD_SCC_REGISTERED: '1'
-  VIRTIO_CONSOLE: '0'
   AUTOMATED_REGISTER: 'false'
   HA_CLUSTER: '1'
   INSTANCE_ID: '00'

diff --git a/schedule/sles4sap/qam/common/qam_hana_cluster_node.yaml b/schedule/sles4sap/qam/common/qam_hana_cluster_node.yaml
@@ -28,7 +28,6 @@ vars:
   BOOT_HDD_IMAGE: '1'
   USE_SUPPORT_SERVER: '1'
   HDD_SCC_REGISTERED: '1'
-  VIRTIO_CONSOLE: '0'
   AUTOMATED_REGISTER: 'false'
   HA_CLUSTER: '1'
   INSTANCE_ID: '00'

diff --git a/tests/ha/fencing.pm b/tests/ha/fencing.pm
@@ -19,6 +19,11 @@ sub run {
     my $node_to_fence = get_var('NODE_TO_FENCE', undef);
     my $node_index = !defined $node_to_fence ? 1 : 2;
 
+    # Force this module to run in the root-console. This is required, as when the test runs
+    # in the serial terminal and it's followed by the boot/boot_to_desktop module, it fails
+    # to match the grub screen
+    select_console 'root-console';
+
     # Check cluster state *before* fencing
     barrier_wait("CHECK_BEFORE_FENCING_BEGIN_${cluster_name}_NODE${node_index}");
     check_cluster_state;

diff --git a/tests/ha/vg.pm b/tests/ha/vg.pm
@@ -126,7 +126,7 @@ sub run {
         }
 
         # Wait to get VG active on all nodes
-        sleep 5;
+        wait_until_resources_started;
     }
     else {
         diag 'Wait until LVM resource is created...';