Boot Agama s390x svirt from hd

lib/Yam/Agama/Pom/RebootTextmodePage.pm

@@ -9,8 +9,7 @@
 package Yam::Agama::Pom::RebootTextmodePage;
 use strict;
 use warnings;
-
-use testapi;
+use power_action_utils 'power_action';
 
 sub new {
     my ($class, $args) = @_;
@@ -19,7 +18,7 @@ sub new {
 
 sub reboot {
     my ($self) = @_;
-    enter_cmd 'reboot';
+    power_action('reboot', keepconsole => 1, first_reboot => 1);
 }
 
 1;

schedule/yam/agama_remote_s390x.yaml

@@ -8,7 +8,6 @@ schedule:
   - yam/agama/patch_agama_tests
   - yam/agama/agama
   - boot/reconnect_mgmt_console
-  - installation/grub_test
   - installation/first_boot
   - yam/validate/validate_product
   - yam/validate/validate_first_user

tests/yam/agama/agama.pm

@@ -19,7 +19,11 @@ use testapi qw(
   record_soft_failure
   parse_extra_log
   upload_logs
+  select_console
+  console
 );
+use Utils::Architectures qw(is_s390x);
+use Utils::Backends qw(is_svirt);
 
 sub run {
     my $self = shift;
@@ -30,9 +34,9 @@ sub run {
     my $tap = "tap.txt";
     my $reporters = "--test-reporter=spec --test-reporter=tap --test-reporter-destination=/tmp/$spec --test-reporter-destination=/tmp/$tap";
     my $node_cmd = "node --enable-source-maps $reporters /usr/share/agama/system-tests/${test}.js $test_options";
-    record_info("node cmd", $node_cmd);
 
     script_run("dmesg --console-off");
+    record_info("node cmd", $node_cmd);
     my $ret = script_run($node_cmd, timeout => 2400);
     script_run("dmesg --console-on");
 
@@ -43,7 +47,15 @@ sub run {
     my $content = script_output("cat /tmp/$spec /tmp/$tap");
     diag($content);
     croak("command \n'$node_cmd'\n failed") unless $ret == 0;
+
     $self->upload_agama_logs();
+
+    # make sure we will boot from hard disk next time
+    if (is_s390x && is_svirt) {
+        select_console 'installation';
+        my $svirt = console('svirt')->change_domain_element(os => boot => {dev => 'hd'});
+    }
+
     $reboot_page->reboot();
 }