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
Before Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 8.4 KiB |
@ -1,16 +0,0 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 15,
|
||||
"type": "match",
|
||||
"width": 160,
|
||||
"xpos": 50,
|
||||
"ypos": 335
|
||||
}
|
||||
],
|
||||
"tags": [
|
||||
"bootloader",
|
||||
"bootloader_bios",
|
||||
"ENV-DISTRI-fedora"
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 3.1 KiB |
@ -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"
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 3.2 KiB |
@ -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
|
||||
}
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 1.7 KiB |
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 1.8 KiB |
@ -1,16 +0,0 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 204,
|
||||
"ypos": 279,
|
||||
"width": 223,
|
||||
"height": 20,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"bootloader",
|
||||
"bootloader_bios"
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 31 KiB |
@ -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"
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 905 B |
@ -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"
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 1021 B |
@ -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"
|
||||
]
|
||||
}
|
Before Width: | Height: | Size: 882 B |
@ -1,15 +1,16 @@
|
||||
{
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"anaconda_install_text_done"
|
||||
],
|
||||
"area": [
|
||||
{
|
||||
"width": 152,
|
||||
"height": 12,
|
||||
"xpos": 183,
|
||||
"type": "match",
|
||||
"width": 152,
|
||||
"xpos": 183,
|
||||
"ypos": 738
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"anaconda_install_text_done",
|
||||
"ENV-DISTRI-rocky"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-anaconda_install_text_done-20211027.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
@ -1,29 +1,30 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 12,
|
||||
"width": 96,
|
||||
"height": 14,
|
||||
"type": "match",
|
||||
"ypos": 386,
|
||||
"xpos": 1
|
||||
"width": 96,
|
||||
"xpos": 55,
|
||||
"ypos": 257
|
||||
},
|
||||
{
|
||||
"type": "match",
|
||||
"height": 13,
|
||||
"type": "match",
|
||||
"width": 128,
|
||||
"xpos": 55,
|
||||
"ypos": 322
|
||||
"ypos": 370
|
||||
},
|
||||
{
|
||||
"height": 14,
|
||||
"type": "match",
|
||||
"width": 119,
|
||||
"height": 13,
|
||||
"xpos": 8,
|
||||
"ypos": 417
|
||||
"xpos": 0,
|
||||
"ypos": 193
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"anaconda_main_hub_text"
|
||||
"anaconda_main_hub_text",
|
||||
"ENV-DISTRI-rocky"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-anaconda_main_hub_text-20211027.png
Normal file
After Width: | Height: | Size: 6.9 KiB |
@ -1,10 +1,10 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"type": "match",
|
||||
"height": 20,
|
||||
"xpos": 91,
|
||||
"type": "match",
|
||||
"width": 449,
|
||||
"xpos": 91,
|
||||
"ypos": 326
|
||||
}
|
||||
],
|
||||
@ -12,7 +12,7 @@
|
||||
"tags": [
|
||||
"bootloader",
|
||||
"bootloader_bios",
|
||||
"ENV-DISTRI-fedora",
|
||||
"ENV-DISTRI-rocky",
|
||||
"ENV-FLAVOR-server"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-bootloader_bios_offline-20211027.png
Normal file
After Width: | Height: | Size: 3.2 KiB |
@ -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"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-console_password_required-20211029.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
@ -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"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-console_password_required2-20211030.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
25
needles/console/rocky-root_logged_in-20211027.json
Normal 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"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-root_logged_in-20211027.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
17
needles/console/rocky-text_console_login-20211027.json
Normal 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"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-text_console_login-20211027.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
18
needles/console/rocky-user_logged_in-20211027.json
Normal 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"
|
||||
]
|
||||
}
|
BIN
needles/console/rocky-user_logged_in-20211027.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
@ -104,12 +104,21 @@ sub run {
|
||||
unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; }
|
||||
}
|
||||
else {
|
||||
if (get_var("DISTRI") eq "rocky") {
|
||||
# Rocky doesn't have network enabled at boot so we are not prompted
|
||||
# for VNC...
|
||||
# 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 {
|
||||
# on lives, we have to explicitly launch anaconda
|
||||
if (get_var('LIVE')) {
|
||||
|
@ -44,9 +44,10 @@ sub run {
|
||||
"source" => 3,
|
||||
"swselection" => 4,
|
||||
"destination" => 5,
|
||||
"network" => 6,
|
||||
"rootpwd" => 7,
|
||||
"user" => 8
|
||||
"kdump" => 6,
|
||||
"network" => 7,
|
||||
"rootpwd" => 8,
|
||||
"user" => 9
|
||||
);
|
||||
|
||||
# The error message that we are going to check for in the text installation
|
||||
@ -59,6 +60,26 @@ sub run {
|
||||
$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
|
||||
run_with_error_check(sub {console_type_wait($spoke_number{"timezone"} . "\n")}, $error);
|
||||
console_type_wait("1\n"); # Set timezone
|
||||
@ -85,7 +106,7 @@ sub run {
|
||||
console_type_wait("3\n"); # set username
|
||||
console_type_wait("$username\n");
|
||||
# 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
|
||||
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
|
||||
# we're on a debug kernel, debug kernel installs are really slow.
|
||||
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;
|
||||
}
|
||||
|
||||
|