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

Fix VERSION and PRETTY_NAME os-release checks for Silverblue.

Browse Source 
This PR fixes #124.
It uses the BUILD variable to get the build string from the
tested compose and uses it to compare correct values for Silverblue.
Originally, it used Workstation values that did not match the
Silveblue ones.

Delete bad yank.
This commit is contained in:
Lukas Ruzicka 2019-10-04 13:11:23 +02:00
parent 80dea7efe2
commit 5aa9ca1cf3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/os_release.pm
View File

@ -34,6 +34,10 @@ sub run {
# correct variables to compare the system data with. # correct variables to compare the system data with.
# First, we know the basic stuff # First, we know the basic stuff
my $id = get_var("DISTRI"); # Should be "fedora" my $id = get_var("DISTRI"); # Should be "fedora"
my $silvertag = get_var("BUILD"); # Takes the build string for Silverblue variants.
# Cut the "Fedora-XX-" part of the build number and leave the XXXXXXXX.n.X part.
$silvertag =~ s/\D+\d\d-//g;
my $name = ucfirst($id); my $name = ucfirst($id);
my $version_id = get_var("VERSION"); # Should be the version number or Rawhide. my $version_id = get_var("VERSION"); # Should be the version number or Rawhide.
my $varstr = spell_version_number($version_id); my $varstr = spell_version_number($version_id);
@ -67,8 +71,17 @@ sub run {
} }
my $version = "$version_id ($varstr)"; my $version = "$version_id ($varstr)";
# Version looks differently when the build is a Silverblue. We need to form
# a different string here, including the silverblue tag.
if ($subvariant eq "Silverblue") {
$version = "$version_id.$silvertag ($varstr)";
}
my $platform_id = "platform:f$version_id"; my $platform_id = "platform:f$version_id";
my $pretty = "$name $version_id ($varstr)"; my $pretty = "$name $version_id ($varstr)";
# Same problem is when testing the PRETTY_NAME.
if ($subvariant eq "Silverblue") {
$pretty = "$name $version_id.$silvertag ($varstr)";
}
#Now. we can start testing the real values from the installed system. #Now. we can start testing the real values from the installed system.
my @fails = (); my @fails = ();