testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Drop old version conditionals

Browse Source 
We're well past 27 now...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-01-10 14:20:44 -08:00
parent fcb06a874c
commit dba4e8c57d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils.pm
View File

@ -578,8 +578,8 @@ 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' is never *really* skipped (see above) # except 'language' is never *really* skipped (see above)
@nexts = grep {$_ ne 'keyboard'} @nexts if ($version eq 'rawhide' || $version > 27); @nexts = grep {$_ ne 'keyboard'} @nexts;
@nexts = grep {$_ ne 'timezone'} @nexts if ($version eq 'rawhide' || $version > 27); @nexts = grep {$_ ne 'timezone'} @nexts;
} }
else { else {
# 'timezone' and 'software' are suppressed for the 'existing user' # 'timezone' and 'software' are suppressed for the 'existing user'
@ -589,7 +589,7 @@ sub gnome_initial_setup {
} }
# 'additional software sources' screen does not display on F28+: # 'additional software sources' screen does not display on F28+:
# https://bugzilla.gnome.org/show_bug.cgi?id=794825 # https://bugzilla.gnome.org/show_bug.cgi?id=794825
@nexts = grep {$_ ne 'software'} @nexts if ($version eq 'rawhide' || $version > 27); @nexts = grep {$_ ne 'software'} @nexts;
assert_screen "next_button", $args{timeout}; assert_screen "next_button", $args{timeout};
# wait a bit in case of animation # wait a bit in case of animation