Test Suite: install_default on rocky-8.5-[minimal|boot|dvd]-iso-x86_64 (#77)

Merging per testing team conversation meeting.

* Correctly check for default packagesets for each flavor

* FIF updates for default packagesets

- Set DESKTOP=gnome to trigger graphical_wait_login instead of
  console_wait_login
- Increase virtual disk size to account for default packagesets

* Correctly check for minimal-iso default packageset

* Updated needles for issue 16

* Update templates.fif.json with package set test suites

Package sets tested per ISO will follow these conventions:
- Test suites will not be duplicated between the boot and dvd ISOs
- All default package sets will be tested against dvd-iso
- Boot ISO will be considered valid if `minimal` package set installs
  cleanly

* Do not add updated needle with changed hostname
This commit is contained in:
akatch 2022-03-31 18:23:01 -05:00 committed by GitHub
parent 049f5f4ba2
commit ff8ce569c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 34 deletions

View File

@ -0,0 +1,17 @@
{
"area": [
{
"width": 55,
"type": "match",
"height": 25,
"ypos": 37,
"xpos": 958
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-english",
"next_button"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -454,6 +454,8 @@
"rocky-dvd-iso-x86_64-*-uefi": 11 "rocky-dvd-iso-x86_64-*-uefi": 11
}, },
"settings": { "settings": {
"DESKTOP": "gnome",
"HDDSIZEGB": "15",
"PACKAGE_SET": "default", "PACKAGE_SET": "default",
"POSTINSTALL": "_collect_data" "POSTINSTALL": "_collect_data"
} }
@ -616,17 +618,13 @@
}, },
"install_package_set_minimal": { "install_package_set_minimal": {
"profiles": { "profiles": {
"rocky-boot-iso-x86_64-*-64bit": 10,
"rocky-boot-iso-x86_64-*-uefi": 11,
"rocky-dvd-iso-x86_64-*-64bit": 11,
"rocky-dvd-iso-x86_64-*-uefi": 11,
"rocky-minimal-iso-x86_64-*-64bit": 10,
"rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-aarch64-*-aarch64": 30,
"rocky-universal-x86_64-*-64bit": 30 "rocky-universal-x86_64-*-64bit": 30,
},
"settings": {
"PACKAGE_SET": "minimal",
"POSTINSTALL": "_console_login"
}
},
"install_package_set_minimal": {
"profiles": {
"rocky-universal-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
@ -636,6 +634,9 @@
}, },
"install_package_set_server": { "install_package_set_server": {
"profiles": { "profiles": {
"rocky-dvd-iso-x86_64-*-64bit": 11,
"rocky-dvd-iso-x86_64-*-uefi": 11,
"rocky-minimal-iso-x86_64-*-64bit": 10,
"rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },
@ -646,12 +647,15 @@
}, },
"install_package_set_graphical-server": { "install_package_set_graphical-server": {
"profiles": { "profiles": {
"rocky-dvd-iso-x86_64-*-64bit": 11,
"rocky-dvd-iso-x86_64-*-uefi": 11,
"rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
"ENCRYPT_PASSWORD": "weakpassword", "ENCRYPT_PASSWORD": "weakpassword",
"HDDSIZEGB": "15",
"PACKAGE_SET": "graphical-server", "PACKAGE_SET": "graphical-server",
"POSTINSTALL": "_console_login", "POSTINSTALL": "_console_login",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
@ -660,12 +664,15 @@
}, },
"install_package_set_workstation": { "install_package_set_workstation": {
"profiles": { "profiles": {
"rocky-dvd-iso-x86_64-*-64bit": 11,
"rocky-dvd-iso-x86_64-*-uefi": 11,
"rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"DESKTOP": "gnome", "DESKTOP": "gnome",
"ENCRYPT_PASSWORD": "weakpassword", "ENCRYPT_PASSWORD": "weakpassword",
"HDDSIZEGB": "15",
"PACKAGE_SET": "workstation", "PACKAGE_SET": "workstation",
"POSTINSTALL": "_console_login", "POSTINSTALL": "_console_login",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
@ -674,6 +681,8 @@
}, },
"install_package_set_virtualization-host": { "install_package_set_virtualization-host": {
"profiles": { "profiles": {
"rocky-dvd-iso-x86_64-*-64bit": 11,
"rocky-dvd-iso-x86_64-*-uefi": 11,
"rocky-universal-aarch64-*-aarch64": 30, "rocky-universal-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },

View File

@ -7,25 +7,17 @@ sub run {
# Anaconda hub # Anaconda hub
assert_screen "anaconda_main_hub", 300; # assert_screen "anaconda_main_hub", 300; #
# Select package set. Minimal is the default, if 'default' is specified, skip selection, # Select package set.
# but verify correct default in some cases # If 'default' is specified, skip selection, but verify correct default
my $packageset = get_var('PACKAGE_SET', 'minimal'); my $packageset = get_var('PACKAGE_SET', 'default');
if ($packageset eq 'default' || get_var('MODULAR')) { if ($packageset eq 'default') {
# we can't or don't want to check the selected package set in these cases
return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK') || (get_var('DISTRI') eq 'Rocky'));
$self->root_console; $self->root_console;
my $env = 'custom-environment'; my $env = "graphical-server-environment";
if (get_var('SUBVARIANT') eq 'Server') { if (get_var('FLAVOR') eq 'minimal-iso') {
$env = 'server-product-environment'; $env = "server-product-environment";
} }
elsif (get_var('SUBVARIANT') eq 'Workstation') {
$env = 'workstation-product-environment'; assert_script_run "egrep 'selected environment:' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
}
# pre-F35 line looks like:
# 07:51:39,382 INF modules.payloads.payload.dnf.utils: selected environment: custom-environment
# F35+ line looks like:
# 07:40:26,614 DBG ui.lib.software: Selecting the 'custom-environment' environment.
assert_script_run "egrep '(selected env|Selecting the.*environment)' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
send_key "ctrl-alt-f6"; send_key "ctrl-alt-f6";
assert_screen "anaconda_main_hub", 30; assert_screen "anaconda_main_hub", 30;
return; return;
@ -42,18 +34,12 @@ sub run {
# In Rocky, graphical-server starts out selected in the DVD ISO so if that's # In Rocky, graphical-server starts out selected in the DVD ISO so if that's
# what we're looking for we're done # what we're looking for we're done
if (!check_screen("anaconda_".$packageset."_selected", 1)) { if (!check_screen("anaconda_".$packageset."_selected", 1)) {
# select desired environment send_key_until_needlematch("anaconda_".$packageset."_highlighted", "down", 20);
# go through the list 20 times at max (to prevent infinite loop when it's missing)
for (my $i = 0; !check_screen("anaconda_".$packageset."_highlighted", 1) && $i < 20; $i++) {
send_key "down";
}
send_key "spc"; send_key "spc";
} }
# check that desired environment is selected # check that desired environment is selected
assert_screen "anaconda_".$packageset."_selected"; assert_screen "anaconda_".$packageset."_selected";
assert_and_click "anaconda_spoke_done"; assert_and_click "anaconda_spoke_done";
# Anaconda hub # Anaconda hub