mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-21 13:33:08 +00:00
Be case-flexible in ELN version checks
There's some ambiguity about the case of the ELN version string. Currently it's "ELN", it's going to be "eln" soon. Let's just always use case-insensitive comparisons. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
9130518862
commit
201fddcb72
@ -230,7 +230,7 @@ sub run {
|
|||||||
# we set "identification" to "true".
|
# we set "identification" to "true".
|
||||||
# Here, we will watch for the graphical elements in Anaconda main hub.
|
# Here, we will watch for the graphical elements in Anaconda main hub.
|
||||||
my $branched = get_var('VERSION');
|
my $branched = get_var('VERSION');
|
||||||
if ($identification eq 'true' or ($branched ne "Rawhide" && $branched ne "ELN")) {
|
if ($identification eq 'true' or ($branched ne "Rawhide" && lc($branched) ne "eln")) {
|
||||||
check_left_bar(); # See utils.pm
|
check_left_bar(); # See utils.pm
|
||||||
check_prerelease();
|
check_prerelease();
|
||||||
check_version();
|
check_version();
|
||||||
|
@ -78,7 +78,7 @@ sub run {
|
|||||||
# etc.
|
# etc.
|
||||||
my $identification = get_var('IDENTIFICATION');
|
my $identification = get_var('IDENTIFICATION');
|
||||||
my $branched = get_var('VERSION');
|
my $branched = get_var('VERSION');
|
||||||
if ($identification eq 'true' or ($branched ne "Rawhide" && $branched ne "ELN")) {
|
if ($identification eq 'true' or ($branched ne "Rawhide" && lc($branched) ne "eln")) {
|
||||||
check_left_bar() unless ($webui);
|
check_left_bar() unless ($webui);
|
||||||
check_prerelease();
|
check_prerelease();
|
||||||
check_version();
|
check_version();
|
||||||
|
@ -15,7 +15,7 @@ sub run {
|
|||||||
# disable updates-testing; on ELN it doesn't exist and trying to
|
# disable updates-testing; on ELN it doesn't exist and trying to
|
||||||
# disable it causes an error
|
# disable it causes an error
|
||||||
my $disable = '--disablerepo=openqa-testrepo*';
|
my $disable = '--disablerepo=openqa-testrepo*';
|
||||||
$disable .= ' --disablerepo=updates-testing' unless (get_var("VERSION") eq "ELN");
|
$disable .= ' --disablerepo=updates-testing' unless (lc(get_var("VERSION")) eq "eln");
|
||||||
# update the fake acpica-tools (should come from the real repo)
|
# update the fake acpica-tools (should come from the real repo)
|
||||||
# this can take a long time if we get unlucky with the metadata refresh
|
# this can take a long time if we get unlucky with the metadata refresh
|
||||||
assert_script_run "dnf -y $disable update acpica-tools", 600;
|
assert_script_run "dnf -y $disable update acpica-tools", 600;
|
||||||
|
@ -39,7 +39,7 @@ sub run {
|
|||||||
}
|
}
|
||||||
# Here the self identification test code is placed.
|
# Here the self identification test code is placed.
|
||||||
my $branched = get_var('VERSION');
|
my $branched = get_var('VERSION');
|
||||||
if ($identification eq 'true' or ($branched ne "Rawhide" && $branched ne "ELN")) {
|
if ($identification eq 'true' or ($branched ne "Rawhide" && lc($branched) ne "eln")) {
|
||||||
# See utils.pm
|
# See utils.pm
|
||||||
check_top_bar();
|
check_top_bar();
|
||||||
# we don't check version or pre-release because here those
|
# we don't check version or pre-release because here those
|
||||||
|
Loading…
Reference in New Issue
Block a user