WIP fix GUI shutdown issue on s390x backend

see https://progress.opensuse.org/issues/114439 with PR os-autoinst#15176 we expect the failure of GUI shutdown because record_soft_failure got removed and no fix was in place.
Zaoliang · Jul 25, 2022 · 73565fb · 73565fb
1 parent ccf9d6b
commit 73565fb
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/lib/power_action_utils.pm b/lib/power_action_utils.pm
@@ -277,12 +277,23 @@ sub power_action {
         }
         elsif ($action eq 'poweroff') {
             if (is_backend_s390x) {
-                record_info('poo#114439', 'Temporary workaround, because shutdown module is marked as failed on s390x backend when shutting down from GUI.');
-                select_console 'root-console';
-                enter_cmd "$action";
-            }
-            else {
-                poweroff_x11;
+                if (check_var("DESKTOP", "gnome")) {
+                    send_key "ctrl-alt-delete";
+                    assert_screen 'logoutdialog', 15;
+                    assert_and_click 'gnome-shell_shutdown_btn';
+                    if (get_var("SHUTDOWN_NEEDS_AUTH")) {
+                        assert_screen 'shutdown-auth';
+                        type_password;
+                        # we need to kill all open ssh connections before the system shuts down
+                        prepare_system_shutdown;
+                        send_key "ret";
+                    }
+                }
+                else {
+                    record_info('poo#114439', 'Temporary workaround, because shutdown module is marked as failed on s390x backend when shutting down from GUI.');
+                    select_console 'root-console';
+                    enter_cmd "$action";
+                }
             }
         }
     }