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

9.0 release fixes #105

Merged
akatch merged 47 commits from 9.0_release_fixes into develop 2022-08-11 14:17:29 +00:00
Conversation 1 Commits 47 Files Changed 197 +10 -14
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79621d45dd - Show all commits

24
tests/os_release.pm
View File

@ -39,18 +39,18 @@ sub run {
# $NAME is "Rocky Linux" not just "Rocky"
my $fullname = $name . " Linux";
my $version_id = get_var("VERSION"); # Should be the version number.
my ($ver_major, $ver_minor) = split /\./, $version_id;
my $varstr = spell_version_number($version_id);
my $target = lc($ver_major);
my $version_id = get_var("VERSION"); # Should be the version number.
my ($ver_major, $ver_minor) = split /\./, $version_id;
my $varstr = spell_version_number($version_id);
my $target = lc($ver_major);
my $reltag = script_output 'rpm -q rocky-release --qf "%{RELEASE}\n"';
my ($relver, $eltag) = split /\./, $reltag;
my $reltag = script_output 'rpm -q rocky-release --qf "%{RELEASE}\n"';
my ($relver, $eltag) = split /\./, $reltag;
my $code_name = get_var("CODENAME", 'Green Obsidian');
my $code_name = get_var("CODENAME", 'Green Obsidian');
my $version = "$version_id ($code_name)";
my $platform_id = "platform:$eltag";
my $pretty = "$fullname $version_id ($code_name)";
my $pretty = "$fullname $version_id ($code_name)";
#Now. we can start testing the real values from the installed system.
my @fails = ();
@ -65,7 +65,7 @@ sub run {
rec_log "VERSION should be $version and is $strip", $strip eq $version, $failref;
# Test for version_id
$strip = strip_marks($content{'VERSION_ID'});
$strip = strip_marks($content{'VERSION_ID'});
rec_log "VERSION_ID should be $version_id and is $strip", $strip eq $version_id, $failref;
# Test for platform_id
@ -81,7 +81,7 @@ sub run {
rec_log "ROCKY_SUPPORT_PRODUCT should be $name and is $strip", $strip eq $fullname, $failref;
# Test for Rocky Support Product Version
$strip = strip_marks($content{ROCKY_SUPPORT_PRODUCT_VERSION});
$strip = strip_marks($content{ROCKY_SUPPORT_PRODUCT_VERSION});
rec_log "ROCKY_SUPPORT_PRODUCT_VERSION should be $target and is $strip", $strip eq $target, $failref;
# VERSION_ID should be 8.4 and is "8.4"
@ -89,10 +89,6 @@ sub run {
# ROCKY_SUPPORT_PRODUCT should be Rocky and is Rocky Linux
# ROCKY_SUPPORT_PRODUCT_VERSION should be and is 8 at /var/lib/openqa/share/tests/rocky/tests/os_release.pm line 95.
# Check for fails, count them, collect their messages and die if something was found.
my $failcount = scalar @fails;
script_run "echo \"There were $failcount failures in total.\" >> /tmp/os-release.log";