Fixes for server_cockpit, server_filesystem and release_identification in 9.1 & 8.7 #142

Merged
AlanMarshall merged 5 commits from 9.1_agm into develop 2023-01-20 18:57:38 +00:00
10 changed files with 59 additions and 2 deletions

View File

@ -0,0 +1,16 @@
{
"area": [
{
"height": 77,
"width": 232,
"type": "match",
"ypos": 221,
"xpos": 515
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 200,
"height": 77,
"type": "match",
"width": 232,
"xpos": 515
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 328,
"ypos": 366,
"width": 59,
"height": 25,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_services_entry"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@ -23,6 +23,9 @@ sub run {
# Wait for the text login # Wait for the text login
boot_to_login_screen(timeout => $wait_time); boot_to_login_screen(timeout => $wait_time);
# switch to TTY3 for both, graphical and console tests
$self->root_console(tty=>3);
# do user login unless USER_LOGIN is set to string 'false' # do user login unless USER_LOGIN is set to string 'false'
unless (get_var("USER_LOGIN") eq "false") { unless (get_var("USER_LOGIN") eq "false") {
# this avoids us waiting 90 seconds for a # to show up # this avoids us waiting 90 seconds for a # to show up

View File

@ -5,6 +5,9 @@ use utils;
sub run { sub run {
my $self = shift; my $self = shift;
# switch to TTY3 for both, graphical and console tests
$self->root_console(tty=>3);
# set up appropriate repositories # set up appropriate repositories
repo_setup(); repo_setup();
# use --enablerepo=fedora for Modular compose testing (we need to # use --enablerepo=fedora for Modular compose testing (we need to

View File

@ -43,7 +43,7 @@ sub run {
my $ver_major = substr($version_id, 0, index($version_id, q/./)); my $ver_major = substr($version_id, 0, index($version_id, q/./));
my $ver_minor = substr($version_id, index($version_id, q/./), length($version_id)); my $ver_minor = substr($version_id, index($version_id, q/./), length($version_id));
my $target = lc($ver_major); my $target = lc($ver_major);
if ( $ver_major = '9' ) { if ( $ver_major == '9' || '8' ) {
$target = lc($version_id); $target = lc($version_id);
} }
@ -82,7 +82,7 @@ sub run {
# Test for Rocky Support Product # Test for Rocky Support Product
$strip = strip_marks($content{'ROCKY_SUPPORT_PRODUCT'}); $strip = strip_marks($content{'ROCKY_SUPPORT_PRODUCT'});
if ( $ver_major = '9' ) { if ( $ver_major == '9' || '8' ) {
$fullname = qq/$fullname $ver_major/; $fullname = qq/$fullname $ver_major/;
$fullname =~ s/ /-/g; $fullname =~ s/ /-/g;
} }

View File

@ -5,6 +5,9 @@ use utils;
sub run { sub run {
my $self = shift; my $self = shift;
# switch to TTY3 for both, graphical and console tests
$self->root_console(tty=>3);
# check / is xfs, as it should be on server # check / is xfs, as it should be on server
assert_script_run 'findmnt -M / -o FSTYPE | grep xfs'; assert_script_run 'findmnt -M / -o FSTYPE | grep xfs';
} }