Skip to content

Commit 69f902d

Browse files
Disable grub timeout in SLES for SAP 16.0 tests on pvm_hmc
The default 8s timeout can cause some tests on pvm_hmc backend to fail as `lib/sles4sap::reboot()` would call 2 times `lib/opensusebasetests::wait_grub()`, and 8s could be not enough time to assert the grub screen twice. This commit disables the grub timeout on SLES for SAP 16.0 installations by adding `stopOnBootMenu: true` in `data/sles4sap/agama/sles_sap_default_ppc64le.jsonnet` and also adds in the related schedules the module `installation/grub_test` to handle the grub screen before first boot. Related Ticket: https://jira.suse.com/browse/TEAM-10611
1 parent 3814084 commit 69f902d

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

data/sles4sap/agama/sles_sap_default_ppc64le.jsonnet

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
id: '{{AGAMA_PRODUCT_ID}}',
44
registrationCode: '{{SCC_REGCODE_SLES4SAP}}',
55
},
6+
bootloader: {
7+
stopOnBootMenu: true
8+
},
69
root: {
710
password: '$6$vYbbuJ9WMriFxGHY$gQ7shLw9ZBsRcPgo6/8KmfDvQ/lCqxW8/WnMoLCoWGdHO6Touush1nhegYfdBbXRpsQuy/FTZZeg7gQL50IbA/',
811
hashedPassword: true,

schedule/sles4sap/agama_saptune_on_pvm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ vars:
1212
schedule:
1313
- installation/bootloader
1414
- installation/agama_reboot
15+
- installation/grub_test
1516
- installation/first_boot
1617
- console/system_prepare
1718
- sles4sap/saptune/mr_test

schedule/sles4sap/hana/pvm_hana_cluster_node_sle16.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ schedule:
4040
- '{{barrier_init}}'
4141
- installation/bootloader
4242
- installation/agama_reboot
43+
- installation/grub_test
4344
- installation/first_boot
4445
- ha/wait_barriers
4546
- console/system_prepare

schedule/sles4sap/sles4sap_agama_auto_install_pvm_test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ schedule:
77
- '{{barrier_init}}'
88
- yam/agama/boot_agama
99
- installation/agama_reboot
10+
- installation/grub_test
1011
- installation/first_boot
1112
- console/system_prepare
1213
- console/consoletest_setup

0 commit comments

Comments
 (0)