Merge pull request #109 from akatch/skip_license_screen

[9.0 Release Issues]: Skip license screen
This commit is contained in:
akatch 2022-06-19 14:29:33 -05:00 committed by GitHub
commit 1a59d0740d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 12 deletions

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 418,
"ypos": 361,
"width": 32,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-english",
"graphical_login_test_user_highlighted"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -0,0 +1,19 @@
{
"area": [
{
"width": 206,
"type": "match",
"height": 106,
"xpos": 408,
"ypos": 642
}
],
"properties": [],
"tags": [
"DESKTOP-gnome",
"ENV-DISTRI-rocky",
"LANGUAGE-english",
"graphical_login",
"login_screen"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -40,6 +40,9 @@ sub run {
# desktop
unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
# in 9.0, license screens are not shown by default
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/9.0_release_notes/index#enhancement_installer-and-image-creation
unless ($version eq '9.0') {
# for Rocky Linux here happens to be a license acceptance screen
# the initial appearance can sometimes take really long
assert_screen "gdm_initial_setup_license", 120;
@ -53,6 +56,7 @@ sub run {
assert_screen "gdm_initial_setup_license_accepted";
assert_and_click "gdm_initial_setup_spoke_forward";
}
}
boot_to_login_screen(timeout => $wait_time);
# if USER_LOGIN is set to string 'false', we're done here
@ -61,6 +65,10 @@ sub run {
# GDM 3.24.1 dumps a cursor in the middle of the screen here...
mouse_hide;
if (get_var("DESKTOP") eq 'gnome') {
if ($version eq '9.0') {
send_key_until_needlematch("graphical_login_test_user_highlighted", "tab", 5);
assert_screen "graphical_login_test_user_highlighted";
}
# we have to hit enter to get the password dialog, and it
# doesn't always work for some reason so just try it three
# times
@ -104,6 +112,9 @@ sub run {
handle_welcome_screen unless (get_var("_welcome_done"));
}
}
if ($version eq '9.0') {
handle_welcome_screen unless (get_var("_welcome_done"));
}
if (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
# handle welcome screen if we didn't do it above (holy flow
# control, Batman!)