testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Correctly check for default packagesets for each flavor

Browse Source
This commit is contained in:
Al Bowles 2022-02-09 20:05:34 -06:00
parent 049f5f4ba2
commit 30cbff08c9
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/_software_selection.pm
View File

@ -7,25 +7,21 @@ 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. Default is 'graphical-server', unless FLAVOR=minimal, where default is 'server'.
# 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', 'graphical-server');
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 # if PACKAGE_SET=default, actually check for these:
return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK') || (get_var('DISTRI') eq 'Rocky')); # dvd-iso = graphical-server
# minimal-iso = server
# boot-iso = graphical-server
$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-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;