Fixes multiple tests in regard of the PACKAGE_SETs graphical-server and workstation (#61)

tcooper confirmed on the call. Merging it.

* Extend product test commands

* Increase disk size for `install_standard_partition_ext4` because some PACKAGE_SETs are too big

* Limit the license acceptance to only run on tests which run for ISO installations
It is unfortunately not that easy to limit this to ISOs due to that the misterous
limit to HDD_1 and not `custom_resize_lvm`

* Make sure that the disk post installs run in a shell
it happens that the previous test ends in the GUI

Co-authored-by: lumarel <lumarel@users.noreply.github.com>

RESULTS.md

@@ -16,47 +16,74 @@ Product test commands
 ---
 
 rocky-boot-iso-x86_64-*
-```
+```sh
-sudo openqa-cli api -X POST isos \
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-boot.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
-  FLAVOR=boot-iso \
   ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=boot-iso \
+  VERSION=8.4 \
   BUILD="-boot-iso-$(date +%Y%m%d.%H%M%S).0"
 ```
 
 rocky-minimal-iso-x86_64-*
-```
+```sh
-sudo openqa-cli api -X POST isos \
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-minimal.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
-  FLAVOR=minimal-iso \
   ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=minimal-iso \
+  VERSION=8.4 \
   BUILD="-minimal-iso-$(date +%Y%m%d.%H%M%S).0"
 ```
 
 rocky-dvd-iso-x86_64-*
-```
+```sh
-sudo openqa-cli api -X POST isos \
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-dvd1.iso \
-  DISTRI=rocky \
+  ARCH=x86_64 DISTRI=rocky \
-  VERSION=8.4 \
   FLAVOR=dvd-iso \
+  PACKAGE_SET=minimal \
+  VERSION=8.4 \
+  BUILD="-minimal-$(date +%Y%m%d.%H%M%S).0"
+
+openqa-cli api -X POST isos \
+  ISO=Rocky-8.4-x86_64-dvd1.iso \
   ARCH=x86_64 \
-  BUILD="-dvd-iso-$(date +%Y%m%d.%H%M%S).0"
+  DISTRI=rocky \
+  FLAVOR=dvd-iso \
+  PACKAGE_SET=server \
+  VERSION=8.4 \
+  BUILD="-server-$(date +%Y%m%d.%H%M%S).0"
+
+openqa-cli api -X POST isos \
+  ISO=Rocky-8.4-x86_64-dvd1.iso \
+  ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=dvd-iso \
+  PACKAGE_SET=graphical-server \
+  DESKTOP=gnome \
+  VERSION=8.4 \
+  BUILD="-graphical-server-$(date +%Y%m%d.%H%M%S).0"
+
+openqa-cli api -X POST isos \
+  ISO=Rocky-8.4-x86_64-dvd1.iso \
+  ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=dvd-iso \
+  PACKAGE_SET=workstation \
+  DESKTOP=gnome \
+  VERSION=8.4 \
+  BUILD="-workstation-$(date +%Y%m%d.%H%M%S).0"
 ```
 
 rocky-universal-x86_64-*
-```
+```sh
-sudo openqa-cli api -X POST isos \
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-dvd1.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
-  FLAVOR=universal \
   ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=universal \
+  VERSION=8.4 \
   BUILD="-universal-$(date +%Y%m%d.%H%M%S).0"
 ```
-
-

templates.fif.json

@@ -562,6 +562,7 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
+                "HDDSIZEGB": "15",
                 "PARTITIONING": "custom_standard_partition_ext4",
                 "ROOT_PASSWORD": "weakpassword"
             }

tests/_graphical_wait_login.pm

@@ -39,6 +39,7 @@ sub run {
     # install, which transitions straight from g-i-s to logged-in
     # desktop
     unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
+        unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
             # for Rocky Linux here happens to be a license acceptance screen
             # the initial appearance can sometimes take really long
             assert_screen "gdm_initial_setup_license", 120;
@@ -51,6 +52,7 @@ sub run {
             wait_still_screen 5, 30;
             assert_screen "gdm_initial_setup_license_accepted";
             assert_and_click "gdm_initial_setup_spoke_forward";
+        }
 
         boot_to_login_screen(timeout => $wait_time);
         # if USER_LOGIN is set to string 'false', we're done here

tests/disk_custom_lvm_ext4_postinstall.pm

@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     my $devboot = 'vda1';
 

tests/disk_custom_lvmthin_postinstall.pm

@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     # check that lvmthinpool is present:
     # http://atodorov.org/blog/2015/04/14/how-to-find-if-lvm-volume-is-thinly-provisioned/

tests/disk_custom_software_raid_postinstall.pm

@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     # check that RAID is used
     assert_script_run "cat /proc/mdstat | grep 'Personalities : \\\[raid1\\\]'";

tests/disk_custom_standard_partition_ext4_postinstall.pm

@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     my $count = 4;
     my $devroot = 'vda1';