From 2458ff7580b5066170214102b25c11146f8a56c2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 12 Sep 2023 11:09:52 -0700 Subject: [PATCH] Adjust tests to handle webUI reversion We're reverting webUI for Fedora 39. https://bodhi.fedoraproject.org/updates/FEDORA-2023-73c4f1a802 is the update that implements this; adapt the tests to handle it (by expecting the old flow when testing that update, and editing the kickstart to drop anaconda-webui when building the live image). Signed-off-by: Adam Williamson --- lib/utils.pm | 3 ++- tests/_live_build.pm | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/utils.pm b/lib/utils.pm index 816e904e..3dadbc8e 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -725,6 +725,7 @@ sub gnome_initial_setup { @_ ); my $relnum = get_release_number; + my $advortask = get_var("ADVISORY_OR_TASK"); # note: when 'language' is "skipped", it's turned into a 'welcome' # page, which has a "Start Setup" button, not a "Next" button @@ -756,7 +757,7 @@ sub gnome_initial_setup { # 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) { + if ($relnum < 39 || $advortask eq "FEDORA-2023-73c4f1a802") { @nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts; } diff --git a/tests/_live_build.pm b/tests/_live_build.pm index babe2d7a..368ef95a 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -79,6 +79,11 @@ 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