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

Stop wiping the openh264 repo

Browse Source 
This caused problems (particularly with the more obscure package
install paths like cockpit and realmd) before, but I don't really
like removing it, as it differs from real-world usage. Tests are
currently failing because of a bug in this repo wiping - in
upgrade_preinstall, we should wipe the file again after the
dnf -y update --refresh call, in case that reinstalls it - but
instead of fixing that, let's try just leaving the file alone.

The risk here is that we run into problems when the repo doesn't
exist, again. In theory we should not because it has
skip_if_unavailable=True , and everything *should* respect that.
But if it does turn out to still be a problem we'll have to
revert this and fix upgrade_preinstall.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-04-03 12:52:30 -07:00
parent b14f82d002
commit 394249079f
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils.pm
View File

@ -751,15 +751,8 @@ sub _repo_setup_updates {
} }
sub repo_setup { sub repo_setup {
# This repo does not always exist for Rawhide or Branched, and
# some things (at least realmd) try to update the repodata for
# it even though it is disabled, and fail. At present none of the
# tests needs it, so let's just unconditionally nuke it.
assert_script_run "rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo";
# Run the appropriate sub-function for the job # Run the appropriate sub-function for the job
get_var("ADVISORY_OR_TASK") ? _repo_setup_updates : _repo_setup_compose; get_var("ADVISORY_OR_TASK") ? _repo_setup_updates : _repo_setup_compose;
# wipe the openh264 file again in case it came back during repo setup
assert_script_run "rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo";
} }
sub console_initial_setup { sub console_initial_setup {

3
tests/upgrade_preinstall.pm
View File

@ -20,9 +20,6 @@ sub run {
# from branched to rawhide to ensure we don't get packages from # from branched to rawhide to ensure we don't get packages from
# updates-testing for anything we do between here and upgrade_run # updates-testing for anything we do between here and upgrade_run
disable_updates_repos(both => 0); disable_updates_repos(both => 0);
# disable openh264 repo, otherwise stuff from it might cause
# trouble when it's disabled by repo_setup later
assert_script_run "rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo";
assert_script_run 'dnf -y update --refresh', 1800; assert_script_run 'dnf -y update --refresh', 1800;
script_run "reboot", 0; script_run "reboot", 0;