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

FIX: release_identification for Rocky Linux 9 #116

Merged
tcooper merged 8 commits from release_ident_9 into 9.0_release_fixes 2022-07-01 22:33:02 +00:00
Conversation 2 Commits 8 Files Changed 25 +22 -5
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee3005b8f7 - Show all commits

19
lib/utils.pm
View File

@ -5,9 +5,10 @@ use strict;
use base 'Exporter'; use base 'Exporter';
use Exporter; use Exporter;
use feature "switch";
use lockapi; use lockapi;
use testapi; use testapi;
our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type repo_setup setup_workaround_repo cleanup_workaround_repo console_initial_setup handle_welcome_screen gnome_initial_setup anaconda_create_user check_desktop download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut lo_dismiss_tip disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile get_release_number check_left_bar check_top_bar check_prerelease check_version spell_version_number _assert_and_click is_branched rec_log click_unwanted_notifications repos_mirrorlist register_application get_registered_applications solidify_wallpaper/; our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout desktop_switch_layout console_loadkeys_us do_bootloader boot_decrypt check_release menu_launch_type repo_setup setup_workaround_repo cleanup_workaround_repo console_initial_setup handle_welcome_screen gnome_initial_setup anaconda_create_user check_desktop download_modularity_tests quit_firefox advisory_get_installed_packages advisory_check_nonmatching_packages start_with_launcher quit_with_shortcut lo_dismiss_tip disable_firefox_studies select_rescue_mode copy_devcdrom_as_isofile get_release_number get_code_name check_left_bar check_top_bar check_prerelease check_version spell_version_number _assert_and_click is_branched rec_log click_unwanted_notifications repos_mirrorlist register_application get_registered_applications solidify_wallpaper/;
# We introduce this global variable to hold the list of applications that have # We introduce this global variable to hold the list of applications that have
# registered during the apps_startstop_test when they have sucessfully run. # registered during the apps_startstop_test when they have sucessfully run.
@ -62,6 +63,22 @@ sub get_release_number {
return $version return $version
} }
sub get_code_name {
my $code_name = 'Green Obsidian';
my $version = get_var('VERSION');
my $ver_major = substr($version, 0, index($version, q/./));
given($ver_major){
when ('9') { $code_name = 'Blue Onyx'; }
when ('10') { $code_name = 'Smoky Quartz'; }
when ('11') { $code_name = 'Lavender Calcite'; }
default{
$code_name = 'Green Obsidian';
}
}
return $code_name;
}
# Figure out what tty the desktop is on, switch to it. Assumes we're # Figure out what tty the desktop is on, switch to it. Assumes we're
# at a root console # at a root console
sub desktop_vt { sub desktop_vt {

2
tests/os_release.pm
View File

@ -47,7 +47,7 @@ sub run {
my $reltag = script_output 'rpm -q rocky-release --qf "%{RELEASE}\n"'; my $reltag = script_output 'rpm -q rocky-release --qf "%{RELEASE}\n"';
my ($relver, $eltag) = split /\./, $reltag; my ($relver, $eltag) = split /\./, $reltag;
my $code_name = get_var("CODENAME", 'Green Obsidian'); my $code_name = get_code_name();
my $version = "$version_id ($code_name)"; my $version = "$version_id ($code_name)";
my $platform_id = "platform:$eltag"; my $platform_id = "platform:$eltag";
my $pretty = "$fullname $version_id ($code_name)"; my $pretty = "$fullname $version_id ($code_name)";

2
tests/rocky_release.pm
View File

@ -20,7 +20,7 @@ sub run {
# Version as defined in the VERSION variable. # Version as defined in the VERSION variable.
my $expectver = get_var('VERSION'); my $expectver = get_var('VERSION');
# Code Name as defined in the CODENAME variable or default. # Code Name as defined in the CODENAME variable or default.
my $code_name = get_var('CODENAME', "Green Obsidian"); my $code_name = get_code_name();
# Create the expected content of the release file # Create the expected content of the release file
# and compare it with its real counterpart. # and compare it with its real counterpart.
my $expected = "Rocky Linux release $expectver ($code_name)"; my $expected = "Rocky Linux release $expectver ($code_name)";