mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2025-02-17 21:14:32 +00:00
Various changes for webUI deferral to F40
webUI has been deferred to F40, so we need to expect the old UI flow on F39 now. This should cover everything, I hope. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
2458ff7580
commit
ea8500cf07
@ -747,17 +747,17 @@ 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 F39+ Workstation live
|
# this is the flow we see when booting an F40+ Workstation live
|
||||||
# we only get language and keyboard
|
# we only get language and keyboard
|
||||||
@nexts = ('language', 'keyboard');
|
@nexts = ('language', 'keyboard');
|
||||||
}
|
}
|
||||||
if ($args{prelogin}) {
|
if ($args{prelogin}) {
|
||||||
# 'language', 'keyboard' and 'timezone' were skipped between F28
|
# '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://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 || $advortask eq "FEDORA-2023-73c4f1a802") {
|
if ($relnum < 40) {
|
||||||
@nexts = grep { $_ ne 'keyboard' } @nexts;
|
@nexts = grep { $_ ne 'keyboard' } @nexts;
|
||||||
@nexts = grep { $_ ne 'timezone' } @nexts;
|
@nexts = grep { $_ ne 'timezone' } @nexts;
|
||||||
}
|
}
|
||||||
|
@ -79,11 +79,6 @@ 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
|
||||||
|
@ -32,7 +32,7 @@ sub run {
|
|||||||
# a traditional sense, it's planned to have contextual help
|
# a traditional sense, it's planned to have contextual help
|
||||||
# in future which we may be able to test, but for now just
|
# in future which we may be able to test, but for now just
|
||||||
# skip it
|
# skip it
|
||||||
if ($relnum > 38) {
|
if ($relnum > 39) {
|
||||||
record_soft_failure "no Help in anaconda webUI currently!";
|
record_soft_failure "no Help in anaconda webUI currently!";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ sub run {
|
|||||||
type_very_safely get_var("USER_PASSWORD", "weakpassword");
|
type_very_safely get_var("USER_PASSWORD", "weakpassword");
|
||||||
send_key 'ret';
|
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
|
# since g-i-s 45~beta-3 we get a short g-i-s flow on live boot
|
||||||
# then the welcome tour
|
# then the welcome tour
|
||||||
gnome_initial_setup(live => 1, livetry => 1);
|
gnome_initial_setup(live => 1, livetry => 1);
|
||||||
|
Loading…
Reference in New Issue
Block a user