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

Adjust tests to handle webUI reversion

Browse Source 
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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-09-12 11:09:52 -07:00
parent 20a3deb11c
commit 2458ff7580
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/utils.pm
View File

@ -725,6 +725,7 @@ sub gnome_initial_setup {
@_ @_
); );
my $relnum = get_release_number; my $relnum = get_release_number;
my $advortask = get_var("ADVISORY_OR_TASK");
# note: when 'language' is "skipped", it's turned into a 'welcome' # note: when 'language' is "skipped", it's turned into a 'welcome'
# page, which has a "Start Setup" button, not a "Next" button # 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://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) # 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 'keyboard' } @nexts;
@nexts = grep { $_ ne 'timezone' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts;
} }

5
tests/_live_build.pm
View File

@ -79,6 +79,11 @@ sub run {
if ($version eq $rawrel) { if ($version eq $rawrel) {
assert_script_run 'echo "repo --name=koji-rawhide --baseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/" >> ' . $repoks; 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 # now flatten the kickstart
assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks"; assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks";
# upload the kickstart so we can check it # upload the kickstart so we can check it