Skip to content

Commit b8c3551

Browse files
authored
Merge pull request os-autoinst#21278 from chcao/installation_with_iscsi
Add installation with iscsi ibft disk for agama
2 parents 0802358 + e1ea6ae commit b8c3551

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: agama_iscsi_ibft_unattended
3+
description: >
4+
Perform unattended installation with Agama using iscsi ibft disk.
5+
schedule:
6+
- yam/agama/boot_agama
7+
- yam/agama/agama_auto
8+
- installation/grub_test
9+
- installation/first_boot
10+
- installation/validation/ibft

tests/installation/validation/ibft.pm

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,20 @@ sub ibft_validation {
7474
assert_script_run 'dmesg | grep -E ' . $kb_ibft_messsages;
7575
# Verify grub entries
7676
foreach my $entry (keys %{$ibft_grub}) {
77-
assert_script_run 'grep -r ' . $entry . '=' . $ibft_grub->{$entry} . ' /boot/';
77+
assert_script_run 'grep -r ' . $entry . '=' . $ibft_grub->{$entry} . ' /boot/*';
7878
}
7979
# Enabling iBFT autoconfiguration for the interfaces should be done in initrd
8080
if (is_sle('<15-sp4')) {
8181
assert_script_run 'grep -e rd.iscsi.ibft=1 -e rd.iscsi.firmware=1 /var/log/YaST2/mkinitrd.log';
82-
} else {
82+
}
83+
elsif (is_sle('>=15-sp4') && is_sle('<16')) {
8384
# In recent products yast2-bootloader calls dracut instead of mkinitrd, so the logs differ
8485
assert_script_run 'zgrep -e rd.iscsi.ibft=1 -e rd.iscsi.firmware=1 /var/log/YaST2/y2log*';
8586
}
87+
else {
88+
# SLE16 uses agama, so search the general logs of agama
89+
assert_script_run 'zgrep -e rd.iscsi.ibft=1 -e rd.iscsi.firmware=1 /var/log/agama-installation/*';
90+
}
8691

8792
# Scan for ibft interface
8893
assert_script_run 'ip a | grep -i ibft';

0 commit comments

Comments
 (0)