mirror of
https://github.com/rocky-linux/os-autoinst-distri-rocky.git
synced 2024-12-25 20:20:56 +00:00
dump get_release, just use VERSION
we've always set VERSION as the release anyhow, so just use lc(get_var("VERSION")) whenever we want the release number or 'rawhide'.
This commit is contained in:
parent
d3193be3f7
commit
ff0f5de643
4 changed files with 3 additions and 13 deletions
|
@ -88,16 +88,6 @@ sub boot_to_login_screen {
|
|||
}
|
||||
}
|
||||
|
||||
sub get_release {
|
||||
my $self = shift;
|
||||
if (get_var("RAWHIDE")) {
|
||||
return 'rawhide';
|
||||
}
|
||||
else {
|
||||
return lc((split /-/, get_var("BUILD"))[1]);
|
||||
}
|
||||
}
|
||||
|
||||
sub get_milestone {
|
||||
my $self = shift;
|
||||
# FIXME: we don't know how to do this with Pungi 4 yet.
|
||||
|
|
|
@ -44,7 +44,7 @@ sub run {
|
|||
|
||||
# REPOSITORY_VARIATION should be set to repository URL without version and architecture
|
||||
# appended (it will be appended automatically)
|
||||
$repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
|
||||
$repourl = get_var("REPOSITORY_VARIATION")."/".lc(get_var("VERSION"))."/".get_var("ARCH")."/os";
|
||||
type_string " inst.repo=".$repourl;
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ sub run {
|
|||
|
||||
my $repourl = "";
|
||||
|
||||
$repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
|
||||
$repourl = get_var("REPOSITORY_VARIATION")."/".lc(get_var("VERSION"))."/".get_var("ARCH")."/os";
|
||||
|
||||
# check that the repo was used
|
||||
$self->root_console;
|
||||
|
|
|
@ -4,7 +4,7 @@ use testapi;
|
|||
|
||||
sub run {
|
||||
my $self = shift;
|
||||
my $release = $self->get_release;
|
||||
my $release = lc(get_var("VERSION"));
|
||||
# NOTE: this doesn't actually work yet, it's a FIXME in fedorabase
|
||||
my $milestone = $self->get_milestone;
|
||||
my $args = "--releasever=${release}";
|
||||
|
|
Loading…
Reference in a new issue