quality/os-autoinst-distri-fedora
4
0
Fork 2
Code Issues 32 Pull requests 7 Projects Releases Packages Activity Actions 1

Revert "Ugly hack for giant update FEDORA-2026-54c7ad647e"

Browse source 
This reverts commit cae3eb0f43 and
all the followup fixes, as the update is now stable. I might put
this back in more polished form later, see
#569
This commit is contained in:
Adam Williamson 2026-06-19 10:01:03 +02:00
commit 98404d7572
4 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
main.pm
View file

@ -378,16 +378,6 @@ sub load_postinstall_tests() {
## LOADING STARTS HERE
# UGH UGLY HACK
if (get_var('ADVISORY') eq 'FEDORA-2026-54c7ad647e') {
set_var('TAG', 'f45-build-side-140796');
set_var('ADVISORY', '');
set_var('ADVISORY_OR_TASK', 'f45-build-side-140796');
set_var('ORIGINAL_ADVISORY', 'FEDORA-2026-54c7ad647e');
my $arch = get_var('ARCH');
set_var('UPDATE_OR_TAG_REPO', "https://kojipkgs.fedoraproject.org/repos/f45-build-side-140796/latest/${arch}");
set_var('ADD_REPOSITORY_VARIATION', "https://kojipkgs.fedoraproject.org/repos/f45-build-side-140796/latest/${arch}") if (get_var('ADD_REPOSITORY_VARIATION'));
}
# if user set ENTRYPOINT, run required test directly
# (good for tests where it doesn't make sense to use _boot_to_anaconda, _software_selection etc.)
# if you want to run more than one test via ENTRYPOINT, separate them with space

2
tests/_installer_build.pm
View file

@ -13,7 +13,7 @@ sub run {
my $repo = "fedora.repo";
$repo = "fedora-rawhide.repo" if ($version eq $rawrel);
$repo = "fedora-eln.repo" if (lc($version) eq "eln");
my $advortask = get_var("ORIGINAL_ADVISORY", get_var("ADVISORY_OR_TASK"));
my $advortask = get_var("ADVISORY_OR_TASK");
my $arch = get_var("ARCH");
# python3-dnf is for updvercheck.py
my $packages = "python3-dnf lorax";

2
tests/_kiwi_build.pm
View file

@ -7,7 +7,7 @@ use utils;
sub run {
my $self = shift;
my $version = get_var("VERSION");
my $advortask = get_var("ORIGINAL_ADVISORY", get_var("ADVISORY_OR_TASK"));
my $advortask = get_var("ADVISORY_OR_TASK");
my $rawrel = get_var("RAWREL");
my $brrepo = get_var("BUILDROOT_REPO");
my $branch;

2
tests/_ostree_build.pm
View file

@ -22,7 +22,7 @@ sub run {
else {
$branch = "f${version}";
}
my $advortask = get_var("ORIGINAL_ADVISORY", get_var("ADVISORY_OR_TASK"));
my $advortask = get_var("ADVISORY_OR_TASK");
my $subv = get_var("SUBVARIANT");
my $lcsubv = lc($subv);
my $tag = get_var("TAG");