From ebed9cbf1442883b61fcd5aeecd231f75473878f Mon Sep 17 00:00:00 2001 From: lumarel Date: Wed, 10 Nov 2021 17:18:30 +0100 Subject: [PATCH 1/4] Extend product test commands --- RESULTS.md | 71 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/RESULTS.md b/RESULTS.md index c9e53ad8..976be77e 100644 --- a/RESULTS.md +++ b/RESULTS.md @@ -16,47 +16,74 @@ Product test commands --- rocky-boot-iso-x86_64-* -``` -sudo openqa-cli api -X POST isos \ +```sh +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-* -``` -sudo openqa-cli api -X POST isos \ +```sh +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-* -``` -sudo openqa-cli api -X POST isos \ +```sh +openqa-cli api -X POST isos \ ISO=Rocky-8.4-x86_64-dvd1.iso \ - DISTRI=rocky \ - VERSION=8.4 \ + ARCH=x86_64 DISTRI=rocky \ 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-* -``` -sudo openqa-cli api -X POST isos \ +```sh +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" ``` - - -- 2.43.5 From a8afc7b35b58665b4322a0711083b48236f91140 Mon Sep 17 00:00:00 2001 From: lumarel Date: Wed, 10 Nov 2021 17:19:16 +0100 Subject: [PATCH 2/4] Increase disk size for `install_standard_partition_ext4` because some PACKAGE_SETs are too big --- templates.fif.json | 1 + 1 file changed, 1 insertion(+) diff --git a/templates.fif.json b/templates.fif.json index 6d9489dd..d3083e84 100644 --- a/templates.fif.json +++ b/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" } -- 2.43.5 From d3077164728aa74b894695b4a4adb9508401fbb9 Mon Sep 17 00:00:00 2001 From: lumarel Date: Wed, 10 Nov 2021 17:20:47 +0100 Subject: [PATCH 3/4] 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` --- tests/_graphical_wait_login.pm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index 3d126f7b..ef45a8da 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -39,18 +39,20 @@ 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")) { - # 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; - assert_and_click "gdm_initial_setup_license"; - # Make sure the card has fully lifted until clicking on the buttons - wait_still_screen 5, 30; - assert_and_click "gdm_initial_setup_licence_accept"; - assert_and_click "gdm_spoke_done"; - # As well as coming back - wait_still_screen 5, 30; - assert_screen "gdm_initial_setup_license_accepted"; - assert_and_click "gdm_initial_setup_spoke_forward"; + 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; + assert_and_click "gdm_initial_setup_license"; + # Make sure the card has fully lifted until clicking on the buttons + wait_still_screen 5, 30; + assert_and_click "gdm_initial_setup_licence_accept"; + assert_and_click "gdm_spoke_done"; + # As well as coming back + 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 -- 2.43.5 From af677c8f9c215b56a264658103c76e99b8c63338 Mon Sep 17 00:00:00 2001 From: lumarel Date: Wed, 10 Nov 2021 17:21:43 +0100 Subject: [PATCH 4/4] Make sure that the disk post installs run in a shell it happens that the previous test ends in the GUI --- tests/disk_custom_lvm_ext4_postinstall.pm | 5 +++++ tests/disk_custom_lvmthin_postinstall.pm | 5 +++++ tests/disk_custom_software_raid_postinstall.pm | 5 +++++ tests/disk_custom_standard_partition_ext4_postinstall.pm | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/tests/disk_custom_lvm_ext4_postinstall.pm b/tests/disk_custom_lvm_ext4_postinstall.pm index 8f66a443..d72c18a4 100644 --- a/tests/disk_custom_lvm_ext4_postinstall.pm +++ b/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'; diff --git a/tests/disk_custom_lvmthin_postinstall.pm b/tests/disk_custom_lvmthin_postinstall.pm index 1f2d4c25..0d941739 100644 --- a/tests/disk_custom_lvmthin_postinstall.pm +++ b/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/ diff --git a/tests/disk_custom_software_raid_postinstall.pm b/tests/disk_custom_software_raid_postinstall.pm index 6cff869e..ad3d53d1 100644 --- a/tests/disk_custom_software_raid_postinstall.pm +++ b/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\\\]'"; diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm index 429eabdb..a80d3858 100644 --- a/tests/disk_custom_standard_partition_ext4_postinstall.pm +++ b/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'; -- 2.43.5