srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-11 01:24:20 +00:00
Code Issues Releases Activity

Tweak _boot_to_anaconda and g-i-s flow for new Rawhide g-i-s

Browse Source 
We're dropping the live user mode patch from g-i-s downstream
because it's just too hard to maintain, apparently. So on Rawhide
the live image will boot to the welcome screen as normal, but
running the installer will give you newui rather than webui. If
you need a language other than English you have to sort it out
at the desktop before running the installer.

On first boot, g-i-s will show *all* screens, not skipping
language, keyboard layout or timezone, because we did not see
those in the installer.

This adapts the tests to handle the new flow, and should still
work with the other flows.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-08-20 16:15:55 -07:00
parent 1b2dbf1c3d
commit 76711fd039
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/utils.pm
View File

@ -861,29 +861,30 @@ sub gnome_initial_setup {
# now, we're going to figure out how many of them this test will # now, we're going to figure out how many of them this test will
# *actually* see... # *actually* see...
if ($args{live}) { if ($args{live}) {
# this is the flow we see when booting an F40+ Workstation live # this is the flow we expect to see when booting live images
# we only get language and keyboard # with anaconda webui, though as of 2024-08 it is unused as
# the patch has been dropped due to maintenance difficulty
@nexts = ('language', 'keyboard'); @nexts = ('language', 'keyboard');
} }
if ($args{prelogin}) { if ($args{prelogin}) {
# 'language', 'keyboard' and 'timezone' were skipped between F28 # On releases that use anaconda gtkui, we configure g-i-s to
# and F42 in the 'new user' mode by # skip 'language', 'keyboard' and 'timezone' using a custom
# vendor.conf:
# https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy
# https://bugzilla.redhat.com/show_bug.cgi?id=1474787 , # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 ,
# except 'language' was never *really* skipped (see above) # but 'language' is never *really* skipped (see above)
if ($relnum < 42) { unless (get_var("_ANACONDA_WEBUI")) {
@nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'keyboard' } @nexts;
@nexts = grep { $_ ne 'timezone' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts;
} }
# From gnome-initial-setup 45~beta-3 on, no screens are # On releases that use anaconda-webui, we use vendor.conf to
# skipped in vendor.conf. 'language' and 'keyboard' should be # skip 'language' and 'keyboard' (meaning 'language' is turned
# skipped (meaning 'language' is turned into 'welcome' and # into 'welcome' and 'keyboard' is really skipped) on live
# 'keyboard' is really skipped) on live installs because we saw # installs because we saw them already. network installs and
# them already, but this only works from anaconda 39.32.2 / # disk image deployments will show these screens (which is good
# 40.3 onwards. network installs and disk image deployments # for disk image deployments, but redundant for network
# will show these screens (which is good for disk image # installs)
# deployments, but redundant for network installs) if (match_has_tag "start_setup") {
elsif (match_has_tag "start_setup") {
# if we saw start_setup, that means 'language' was skipped # if we saw start_setup, that means 'language' was skipped
# and we can assume 'keyboard' will also be skipped # and we can assume 'keyboard' will also be skipped
@nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'keyboard' } @nexts;

7
tests/_boot_to_anaconda.pm
View File

@ -151,7 +151,10 @@ sub run {
$count -= 1; $count -= 1;
assert_screen ["live_start_anaconda_icon", "apps_menu_button_active", "next_button"], 300; assert_screen ["live_start_anaconda_icon", "apps_menu_button_active", "next_button"], 300;
if (match_has_tag "next_button") { if (match_has_tag "next_button") {
# we're on F39+ Workstation and looking at gnome-initial-setup # we're looking at gnome-initial-setup - this
# is what we expect on images that use anaconda
# webui, though as of 2024-08 it's disabled due
# to maintenance difficulty
# completing g-i-s launches the installer # completing g-i-s launches the installer
gnome_initial_setup(live => 1); gnome_initial_setup(live => 1);
$launched = 1; $launched = 1;
@ -180,7 +183,7 @@ sub run {
while ($tries) { while ($tries) {
$tries -= 1; $tries -= 1;
assert_and_click("live_start_anaconda_icon", dclick => $dclick); assert_and_click("live_start_anaconda_icon", dclick => $dclick);
last if (check_screen "anaconda_select_install_lang", 180); last if (check_screen ["anaconda_select_install_lang", "anaconda_webui_welcome"], 180);
die "Launching installer failed after 5 tries!" unless ($tries); die "Launching installer failed after 5 tries!" unless ($tries);
} }
} }