Fixes install_anaconda_text@64bit on rocky-8.4-universal-x86_64 (#56)

* remove Fedora needles we are replacing

* do not expect VNC vs Text Mode menu during text install

* Rocky has kdump which changes text mode main hub install menu

* enable network and redo software selection

* do not disable password for user

* extend timeout for install

* add needles for install_anaconda_text

* fix console_password_required needles
This commit is contained in:
Trevor Cooper 2021-11-10 16:47:10 -08:00 committed by GitHub
parent b5a08825e4
commit 75904407ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 197 additions and 213 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"height": 15,
"type": "match",
"width": 160,
"xpos": 50,
"ypos": 335
}
],
"tags": [
"bootloader",
"bootloader_bios",
"ENV-DISTRI-fedora"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -1,17 +0,0 @@
{
"area": [
{
"ypos": 326,
"height": 20,
"xpos": 91,
"type": "match",
"width": 449
}
],
"tags": [
"bootloader",
"bootloader_bios",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -1,25 +0,0 @@
{
"tags": [
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server",
"bootloader",
"bootloader_bios"
],
"properties": [],
"area": [
{
"xpos": 49,
"type": "match",
"ypos": 342,
"height": 10,
"width": 163
},
{
"ypos": 64,
"type": "match",
"xpos": 54,
"width": 54,
"height": 30
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -1,18 +0,0 @@
{
"tags": [
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server",
"bootloader",
"bootloader_bios"
],
"properties": [],
"area": [
{
"xpos": 51,
"ypos": 343,
"width": 513,
"height": 10,
"type": "match"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 204,
"ypos": 279,
"width": 223,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"bootloader",
"bootloader_bios"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

View File

@ -1,17 +0,0 @@
{
"properties": [],
"area": [
{
"xpos": 0,
"height": 17,
"ypos": 79,
"width": 77,
"type": "match"
}
],
"tags": [
"console_password_required",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 905 B

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 1,
"ypos": 79,
"width": 77,
"height": 17,
"type": "match"
}
],
"tags": [
"console_password_required",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1021 B

View File

@ -1,17 +0,0 @@
{
"properties": [],
"area": [
{
"xpos": 1,
"height": 17,
"width": 77,
"ypos": 79,
"type": "match"
}
],
"tags": [
"console_password_required",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 882 B

View File

@ -1,15 +1,16 @@
{ {
"properties": [], "area": [
"tags": [ {
"anaconda_install_text_done" "height": 12,
], "type": "match",
"area": [ "width": 152,
{ "xpos": 183,
"width": 152, "ypos": 738
"height": 12, }
"xpos": 183, ],
"type": "match", "properties": [],
"ypos": 738 "tags": [
} "anaconda_install_text_done",
] "ENV-DISTRI-rocky"
} ]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -1,29 +1,30 @@
{ {
"area": [ "area": [
{ {
"height": 12, "height": 14,
"width": 96, "type": "match",
"type": "match", "width": 96,
"ypos": 386, "xpos": 55,
"xpos": 1 "ypos": 257
}, },
{ {
"type": "match", "height": 13,
"height": 13, "type": "match",
"width": 128, "width": 128,
"xpos": 55, "xpos": 55,
"ypos": 322 "ypos": 370
}, },
{ {
"type": "match", "height": 14,
"width": 119, "type": "match",
"height": 13, "width": 119,
"xpos": 8, "xpos": 0,
"ypos": 417 "ypos": 193
} }
], ],
"properties": [], "properties": [],
"tags": [ "tags": [
"anaconda_main_hub_text" "anaconda_main_hub_text",
] "ENV-DISTRI-rocky"
} ]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@ -1,18 +1,18 @@
{ {
"area": [ "area": [
{ {
"type": "match", "height": 20,
"height": 20, "type": "match",
"xpos": 91, "width": 449,
"width": 449, "xpos": 91,
"ypos": 326 "ypos": 326
} }
], ],
"properties": [], "properties": [],
"tags": [ "tags": [
"bootloader", "bootloader",
"bootloader_bios", "bootloader_bios",
"ENV-DISTRI-fedora", "ENV-DISTRI-rocky",
"ENV-FLAVOR-server" "ENV-FLAVOR-server"
] ]
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 17,
"type": "match",
"width": 77,
"xpos": 1,
"ypos": 111
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"console_password_required"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 17,
"type": "match",
"width": 77,
"xpos": 1,
"ypos": 111
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"console_password_required"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,25 @@
{
"area": [
{
"height": 16,
"type": "match",
"width": 40,
"xpos": 7,
"ypos": 128
},
{
"height": 14,
"type": "match",
"width": 17,
"xpos": 137,
"ypos": 128
}
],
"properties": [],
"tags": [
"root_console",
"root_logged_in",
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 15,
"type": "match",
"width": 61,
"xpos": 72,
"ypos": 96
}
],
"properties": [],
"tags": [
"login_screen",
"text_console_login",
"ENV-DISTRI-rocky"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"height": 14,
"type": "match",
"width": 27,
"xpos": 126,
"ypos": 128
}
],
"properties": [],
"tags": [
"user_logged_in",
"user_console",
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -104,10 +104,19 @@ sub run {
unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; } unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; }
} }
else { else {
assert_screen "anaconda_use_text_mode", 300; if (get_var("DISTRI") eq "rocky") {
type_string "2\n"; # Rocky doesn't have network enabled at boot so we are not prompted
# wait for text version of Anaconda main hub # for VNC...
assert_screen "anaconda_main_hub_text", 300; # wait for text version of Anaconda main hub
assert_screen "anaconda_main_hub_text", 300;
}
else {
# Fedora has a use text mode menu here
assert_screen "anaconda_use_text_mode", 300;
type_string "2\n";
# wait for text version of Anaconda main hub
assert_screen "anaconda_main_hub_text", 300;
}
} }
} }
else { else {

View File

@ -44,9 +44,10 @@ sub run {
"source" => 3, "source" => 3,
"swselection" => 4, "swselection" => 4,
"destination" => 5, "destination" => 5,
"network" => 6, "kdump" => 6,
"rootpwd" => 7, "network" => 7,
"user" => 8 "rootpwd" => 8,
"user" => 9
); );
# The error message that we are going to check for in the text installation # The error message that we are going to check for in the text installation
@ -59,6 +60,26 @@ sub run {
$error = "anaconda_text_error"; $error = "anaconda_text_error";
} }
if (get_var("DISTRI") eq "rocky") {
# Activate Network
run_with_error_check(sub {console_type_wait($spoke_number{"network"} . "\n")}, $error);
console_type_wait("2\n"); # Configure device
console_type_wait("7\n"); # Connect automatically after reboot
console_type_wait("8\n"); # Apply configuration in installer
console_type_wait("c\n"); # Continue
sleep 10;
console_type_wait("r\n"); # Refresh
console_type_wait("c\n"); # Continue
# Software Selection
run_with_error_check(sub {console_type_wait($spoke_number{"swselection"} . "\n")}, $error);
console_type_wait("2\n"); # Server
console_type_wait("c\n"); # Continue
console_type_wait("c\n"); # Continue
sleep 10;
console_type_wait("r\n"); # Refresh
}
# Set timezone # Set timezone
run_with_error_check(sub {console_type_wait($spoke_number{"timezone"} . "\n")}, $error); run_with_error_check(sub {console_type_wait($spoke_number{"timezone"} . "\n")}, $error);
console_type_wait("1\n"); # Set timezone console_type_wait("1\n"); # Set timezone
@ -85,7 +106,7 @@ sub run {
console_type_wait("3\n"); # set username console_type_wait("3\n"); # set username
console_type_wait("$username\n"); console_type_wait("$username\n");
# from Rawhide-20190503.n.0 (F31) onwards, 'use password' is default # from Rawhide-20190503.n.0 (F31) onwards, 'use password' is default
if (get_release_number() < 31) { if (get_release_number() < 31 && lc(get_var('DISTRI')) ne "rocky") {
# typing "4\n" on abrt screen causes system to reboot, so be careful # typing "4\n" on abrt screen causes system to reboot, so be careful
run_with_error_check(sub {console_type_wait("4\n")}, $error); # use password run_with_error_check(sub {console_type_wait("4\n")}, $error); # use password
} }
@ -131,7 +152,7 @@ sub run {
# Wait for install to end. Give Rawhide a bit longer, in case # Wait for install to end. Give Rawhide a bit longer, in case
# we're on a debug kernel, debug kernel installs are really slow. # we're on a debug kernel, debug kernel installs are really slow.
my $timeout = 1800; my $timeout = 1800;
if (lc(get_var('VERSION')) eq "rawhide") { if (lc(get_var('VERSION')) eq "rawhide" || lc(get_var('DISTRI')) eq "rocky") {
$timeout = 2400; $timeout = 2400;
} }