From 239f484144e5f8a83f5dbc026c18727d59981f74 Mon Sep 17 00:00:00 2001 From: rfan1 Date: Wed, 5 Feb 2025 17:56:07 -0500 Subject: [PATCH] Enable s390x install tests on sle16 https://progress.opensuse.org/issues/174685 --- .../agama-create-hdd-textmode_s390x_kvm.yaml | 15 +++++++++++++++ tests/installation/agama_reboot.pm | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 schedule/functional/sle16/agama-create-hdd-textmode_s390x_kvm.yaml diff --git a/schedule/functional/sle16/agama-create-hdd-textmode_s390x_kvm.yaml b/schedule/functional/sle16/agama-create-hdd-textmode_s390x_kvm.yaml new file mode 100644 index 000000000000..c0bf90b17e0d --- /dev/null +++ b/schedule/functional/sle16/agama-create-hdd-textmode_s390x_kvm.yaml @@ -0,0 +1,15 @@ +name: agama-create-hdd-textmode_s390x_kvm +description: > + Install sle16 via agama auto on pvm setup, but it can not publish qcow2 image + +schedule: + - installation/bootloader_zkvm + - installation/agama_reboot + - installation/first_boot + - console/system_prepare + - console/hostname + - console/force_scheduled_tasks + - shutdown/grub_set_bootargs + - shutdown/cleanup_before_shutdown + - shutdown/shutdown + - shutdown/svirt_upload_assets diff --git a/tests/installation/agama_reboot.pm b/tests/installation/agama_reboot.pm index c6fb97309356..6d31c9dbfc17 100644 --- a/tests/installation/agama_reboot.pm +++ b/tests/installation/agama_reboot.pm @@ -26,8 +26,9 @@ use version_utils qw(is_leap is_sle); use utils; use Utils::Logging qw(export_healthcheck_basic); use x11utils 'ensure_unlocked_desktop'; -use Utils::Backends qw(is_ipmi is_pvm); +use Utils::Backends qw(is_ipmi is_pvm is_svirt); use Utils::Architectures qw(is_aarch64 is_s390x); +use power_action_utils 'assert_shutdown_and_restore_system'; sub upload_agama_logs { return if (get_var('NOLOGS')); @@ -73,6 +74,10 @@ sub run { # Swith back to sol console, then user can monitor the boot log select_console 'sol', await_console => 0 if is_ipmi; reconnect_mgmt_console if is_pvm; + if (is_s390x && is_svirt) { + assert_shutdown_and_restore_system; + reconnect_mgmt_console; + } wait_still_screen 10; save_screenshot; return;