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

dump get_release, just use VERSION

Browse Source 
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:
Adam Williamson 2016-01-27 23:34:01 -08:00
parent d3193be3f7
commit ff0f5de643
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/fedorabase.pm
View File

@ -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 { sub get_milestone {
my $self = shift; my $self = shift;
# FIXME: we don't know how to do this with Pungi 4 yet. # FIXME: we don't know how to do this with Pungi 4 yet.

2
tests/_boot_to_anaconda.pm
View File

@ -44,7 +44,7 @@ sub run {
# REPOSITORY_VARIATION should be set to repository URL without version and architecture # REPOSITORY_VARIATION should be set to repository URL without version and architecture
# appended (it will be appended automatically) # 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; type_string " inst.repo=".$repourl;
} }

2
tests/install_source_variation.pm
View File

@ -10,7 +10,7 @@ sub run {
my $repourl = ""; 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 # check that the repo was used
$self->root_console; $self->root_console;

2
tests/upgrade_run.pm
View File

@ -4,7 +4,7 @@ use testapi;
sub run { sub run {
my $self = shift; 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 # NOTE: this doesn't actually work yet, it's a FIXME in fedorabase
my $milestone = $self->get_milestone; my $milestone = $self->get_milestone;
my $args = "--releasever=${release}"; my $args = "--releasever=${release}";