diff --git a/lib/utils.pm b/lib/utils.pm index 3dadbc8e..aaaee796 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -747,17 +747,17 @@ sub gnome_initial_setup { # now, we're going to figure out how many of them this test will # *actually* see... if ($args{live}) { - # this is the flow we see when booting an F39+ Workstation live + # this is the flow we see when booting an F40+ Workstation live # we only get language and keyboard @nexts = ('language', 'keyboard'); } if ($args{prelogin}) { # 'language', 'keyboard' and 'timezone' were skipped between F28 - # and F38 in the 'new user' mode by + # and F39 in the 'new user' mode by # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 , # except 'language' was never *really* skipped (see above) - if ($relnum < 39 || $advortask eq "FEDORA-2023-73c4f1a802") { + if ($relnum < 40) { @nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts; } diff --git a/tests/_live_build.pm b/tests/_live_build.pm index 368ef95a..babe2d7a 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -79,11 +79,6 @@ sub run { if ($version eq $rawrel) { assert_script_run 'echo "repo --name=koji-rawhide --baseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/" >> ' . $repoks; } - # this update implements the reversion of webUI for F39, so we - # need to make the appropriate kickstart change to test it - if ($advortask eq "FEDORA-2023-73c4f1a802") { - script_run "sed -i -e 's,anaconda-webui,,g' fedora-live-${lcsubv}.ks"; - } # now flatten the kickstart assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks"; # upload the kickstart so we can check it diff --git a/tests/anaconda_help.pm b/tests/anaconda_help.pm index e01f91c0..478421ce 100644 --- a/tests/anaconda_help.pm +++ b/tests/anaconda_help.pm @@ -32,7 +32,7 @@ sub run { # a traditional sense, it's planned to have contextual help # in future which we may be able to test, but for now just # skip it - if ($relnum > 38) { + if ($relnum > 39) { record_soft_failure "no Help in anaconda webUI currently!"; return; } diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index 3d2dee20..a8f9c1fb 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -91,7 +91,7 @@ sub run { type_very_safely get_var("USER_PASSWORD", "weakpassword"); send_key 'ret'; } - elsif ($desktop eq 'gnome' && $relnum > 38) { + elsif ($desktop eq 'gnome' && $relnum > 39) { # since g-i-s 45~beta-3 we get a short g-i-s flow on live boot # then the welcome tour gnome_initial_setup(live => 1, livetry => 1);