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>
This commit is contained in:
Lukas Magauer 2021-11-12 02:39:34 +01:00 committed by GitHub
parent 30d7affe38
commit 44e8a76c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 84 additions and 34 deletions

View File

@ -16,47 +16,74 @@ Product test commands
--- ---
rocky-boot-iso-x86_64-* 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 \ ISO=Rocky-8.4-x86_64-boot.iso \
DISTRI=rocky \
VERSION=8.4 \
FLAVOR=boot-iso \
ARCH=x86_64 \ ARCH=x86_64 \
DISTRI=rocky \
FLAVOR=boot-iso \
VERSION=8.4 \
BUILD="-boot-iso-$(date +%Y%m%d.%H%M%S).0" BUILD="-boot-iso-$(date +%Y%m%d.%H%M%S).0"
``` ```
rocky-minimal-iso-x86_64-* 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 \ ISO=Rocky-8.4-x86_64-minimal.iso \
DISTRI=rocky \
VERSION=8.4 \
FLAVOR=minimal-iso \
ARCH=x86_64 \ ARCH=x86_64 \
DISTRI=rocky \
FLAVOR=minimal-iso \
VERSION=8.4 \
BUILD="-minimal-iso-$(date +%Y%m%d.%H%M%S).0" BUILD="-minimal-iso-$(date +%Y%m%d.%H%M%S).0"
``` ```
rocky-dvd-iso-x86_64-* 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 \ ISO=Rocky-8.4-x86_64-dvd1.iso \
DISTRI=rocky \ ARCH=x86_64 DISTRI=rocky \
VERSION=8.4 \
FLAVOR=dvd-iso \ 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 \ 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-* 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 \ ISO=Rocky-8.4-x86_64-dvd1.iso \
DISTRI=rocky \
VERSION=8.4 \
FLAVOR=universal \
ARCH=x86_64 \ ARCH=x86_64 \
DISTRI=rocky \
FLAVOR=universal \
VERSION=8.4 \
BUILD="-universal-$(date +%Y%m%d.%H%M%S).0" BUILD="-universal-$(date +%Y%m%d.%H%M%S).0"
``` ```

View File

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

View File

@ -39,18 +39,20 @@ sub run {
# install, which transitions straight from g-i-s to logged-in # install, which transitions straight from g-i-s to logged-in
# desktop # desktop
unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) { unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
# for Rocky Linux here happens to be a license acceptance screen unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
# the initial appearance can sometimes take really long # for Rocky Linux here happens to be a license acceptance screen
assert_screen "gdm_initial_setup_license", 120; # the initial appearance can sometimes take really long
assert_and_click "gdm_initial_setup_license"; assert_screen "gdm_initial_setup_license", 120;
# Make sure the card has fully lifted until clicking on the buttons assert_and_click "gdm_initial_setup_license";
wait_still_screen 5, 30; # Make sure the card has fully lifted until clicking on the buttons
assert_and_click "gdm_initial_setup_licence_accept"; wait_still_screen 5, 30;
assert_and_click "gdm_spoke_done"; assert_and_click "gdm_initial_setup_licence_accept";
# As well as coming back assert_and_click "gdm_spoke_done";
wait_still_screen 5, 30; # As well as coming back
assert_screen "gdm_initial_setup_license_accepted"; wait_still_screen 5, 30;
assert_and_click "gdm_initial_setup_spoke_forward"; assert_screen "gdm_initial_setup_license_accepted";
assert_and_click "gdm_initial_setup_spoke_forward";
}
boot_to_login_screen(timeout => $wait_time); boot_to_login_screen(timeout => $wait_time);
# if USER_LOGIN is set to string 'false', we're done here # if USER_LOGIN is set to string 'false', we're done here

View File

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

View File

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

View File

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

View File

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