srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 07:13:09 +00:00
Code Issues Releases Activity

os_release: adjust for Fedora CoreOS

Browse Source 
...which just has to be another special flower.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-09-02 16:22:20 -07:00
parent 478b7eff9e
commit e99a3fbdf9
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/os_release.pm
View File

@ -52,6 +52,12 @@ sub run {
# Now, we merge the fields into one expression to create the correct canned tag # Now, we merge the fields into one expression to create the correct canned tag
# that will contain both the version number and the build number. # that will contain both the version number and the build number.
my $cannedtag = "$cannedver.$cannednum"; my $cannedtag = "$cannedver.$cannednum";
# If this is a CoreOS build, though, throw all that away and
# just use the build version
my $build = get_var("BUILD");
if ($build =~ /^Fedora-CoreOS/) {
$cannedtag = (split /-/, $build)[-1];
}
my $name = ucfirst($id); my $name = ucfirst($id);
my $rawrel = get_var("RAWREL", ''); my $rawrel = get_var("RAWREL", '');
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.
@ -113,6 +119,10 @@ sub run {
# Same problem is when testing the PRETTY_NAME. # Same problem is when testing the PRETTY_NAME.
if (get_var("CANNED")) { if (get_var("CANNED")) {
$pretty = "$name $cannedtag ($varstr)"; $pretty = "$name $cannedtag ($varstr)";
# ...and FCOS uses a different format, sigh
if ($build =~ /^Fedora-CoreOS/) {
$pretty = "Fedora CoreOS $cannedtag";
}
} }
#Now. we can start testing the real values from the installed system. #Now. we can start testing the real values from the installed system.