Skip to content

Commit

Permalink
Add agama installation for s390x kvm
Browse files Browse the repository at this point in the history
  • Loading branch information
rfan1 committed Dec 26, 2024
1 parent fbafeb5 commit e348ae2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
8 changes: 4 additions & 4 deletions tests/installation/agama_reboot.pm
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
# Exepcted to be executed right after agama.pm or agama auto install
# This test handles actions that happen once we see the reboot button after install
# 1) Switch from installer to console to Upload logs
# 2) Switch back to X11/Wayland and reset_console s
# 2) Switch back to X11/Wayland and reset_consoles
# so newly booted system does not think that we're still logged in console
# 3) workaround for no ability to disable grub timeout in agama
# https://github.com/openSUSE/agama/issues/1594
# grub_test() is too slow to catch boot screen for us
# 4) for ipmi/pvm backend, vnc access during the installation is not available now,
# 4) for ipmi/pvm/s390x backend, vnc access during the installation is not available now,
# we need to access to live root system to monitor installation process
# Maintainer: Lubos Kocman <[email protected]>,

Expand All @@ -27,7 +27,7 @@ use utils;
use Utils::Logging qw(export_healthcheck_basic);
use x11utils 'ensure_unlocked_desktop';
use Utils::Backends qw(is_ipmi is_pvm);
use Utils::Architectures qw(is_aarch64);
use Utils::Architectures qw(is_aarch64 is_s390x);

sub upload_agama_logs {
return if (get_var('NOLOGS'));
Expand Down Expand Up @@ -93,7 +93,7 @@ sub agama_system_prepare {
sub run {
my ($self) = @_;

if ((is_ipmi || is_pvm) && get_var('AGAMA_AUTO')) {
if ((is_ipmi || is_pvm || is_s390x) && get_var('AGAMA_AUTO')) {
select_console('root-console');
record_info 'Wait for installation phase done';
verify_agama_auto_install_done_cmdline();
Expand Down
15 changes: 10 additions & 5 deletions tests/installation/bootloader_zkvm.pm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use testapi;
use utils qw(OPENQA_FTP_URL type_line_svirt save_svirt_pty);
use ntlm_auth;
use autoyast qw(expand_profile_url);
use version_utils qw(is_agama);

sub set_svirt_domain_elements {
my ($svirt) = shift;
Expand All @@ -32,12 +33,12 @@ sub set_svirt_domain_elements {

my $ntlm_p = get_var('NTLM_AUTH_INSTALL') ? $ntlm_auth::ntlm_proxy : '';
my $cmdline = get_var('VIRSH_CMDLINE') . $ntlm_p . " ";
if (get_var('AGAMA')) {
$cmdline .= "root=live:ftp://" . get_var('REPO_HOST', 'openqa') . '/' . get_var('REPO_999');
if (is_agama) {
$cmdline .= "root=live:http://" . get_var('OPENQA_HOSTNAME') . "/assets/iso/" . get_required_var('ISO') . " live.password=$testapi::password";
} else {
$cmdline .= "install=$repo";
$cmdline .= remote_install_bootmenu_params;
}
$cmdline .= remote_install_bootmenu_params;
if (get_var('UPGRADE')) {
$cmdline .= "upgrade=1 ";
}
Expand All @@ -47,8 +48,9 @@ sub set_svirt_domain_elements {
}

$cmdline .= ' ' . get_var("EXTRABOOTPARAMS") if get_var("EXTRABOOTPARAMS");
# agama.auto and agama.install_url are defined in 'specific_bootmenu_params'
$cmdline .= specific_bootmenu_params;
$cmdline .= registration_bootloader_cmdline if check_var('SCC_REGISTER', 'installation') && !get_var('NTLM_AUTH_INSTALL');
$cmdline .= registration_bootloader_cmdline if check_var('SCC_REGISTER', 'installation') && !get_var('NTLM_AUTH_INSTALL') && !(is_agama);

$svirt->change_domain_element(os => initrd => "$zkvm_img_path/$name.initrd");
$svirt->change_domain_element(os => kernel => "$zkvm_img_path/$name.kernel");
Expand Down Expand Up @@ -85,7 +87,10 @@ sub run {
record_info('VM instance', get_var('VIRSH_INSTANCE'));
record_info('Guest ip', get_var('VIRSH_GUEST'));

return if (get_var('AGAMA'));
if (is_agama) {
wait_serial('Connect to the Agama installer using these URLs', 300) || die "Agama installer didn't start";
return;
}
if (!get_var("BOOT_HDD_IMAGE") or (get_var('PATCHED_SYSTEM') and !get_var('ZDUP'))) {
if (check_var("VIDEOMODE", "text")) {
wait_serial("run 'yast.ssh'", 300) || die "linuxrc didn't finish";
Expand Down

0 comments on commit e348ae2

Please sign in to comment.