srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-08-27 17:45:44 +00:00
Code Issues Releases Activity

Upgrades: don't install target release packages in repo_setup

Browse Source 
F42 to F43 upgrades suddenly started failing, and I think this
is why - we actually wind up installing packages from the target
release in setup_repos (called from repo_setup), because we set
up the buildroot repo then run some dnf commands. Let's tweak
that so for upgrade tests we create the buildroot repo disabled
at first, then enable it in upgrade_run.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-07-10 00:18:54 -07:00
parent 5c5cfae706
commit 27b2859339
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils.pm
View File

@ -736,7 +736,11 @@ sub _repo_setup_updates {
# see e.g. https://pagure.io/fedora-ci/general/issue/376 for why
my $brrepo = get_var("BUILDROOT_REPO");
if ($brrepo && get_var("TEST") ne "support_server") {
assert_script_run 'printf "[buildroot]\nname=buildroot\nbaseurl=https://kojipkgs.fedoraproject.org/repos/' . $brrepo . '/latest/' . $arch . '/\ncost=2000\nenabled=1\ngpgcheck=0\n" > /etc/yum.repos.d/buildroot.repo';
# don't enable it for upgrade tests or else we'll install stuff
# from the target release in setup_repos, we'll enable it right
# before running the upgrade
my $enabled = get_var("UPGRADE") ? "0" : "1";
assert_script_run 'printf "[buildroot]\nname=buildroot\nbaseurl=https://kojipkgs.fedoraproject.org/repos/' . $brrepo . '/latest/' . $arch . '/\ncost=2000\nenabled=' . $enabled . '\ngpgcheck=0\n" > /etc/yum.repos.d/buildroot.repo';
}
if (get_var("CANNED")) {
# install and use en_US.UTF-8 locale for consistent sort

2
tests/upgrade_run.pm
View File

@ -13,6 +13,8 @@ sub run {
# use compose repo (compose tests) or set up update repo (update tests)
cleanup_workaround_repo;
repo_setup();
# enable the buildroot repo now, if relevant
assert_script_run 'sed -i -e "s,enabled=0,enabled=1,g" /etc/yum.repos.d/buildroot.repo' if (get_var("BUILDROOT_REPO"));
my $params = "-y --best --releasever=${relnum}";
if (script_run "dnf ${params} system-upgrade download", 6000) {