diff --git a/lib/utils.pm b/lib/utils.pm index c3a06182..0a252678 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -751,15 +751,8 @@ sub _repo_setup_updates { } 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 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 { diff --git a/tests/upgrade_preinstall.pm b/tests/upgrade_preinstall.pm index 2c00bc47..c4dc01f8 100644 --- a/tests/upgrade_preinstall.pm +++ b/tests/upgrade_preinstall.pm @@ -20,9 +20,6 @@ sub run { # from branched to rawhide to ensure we don't get packages from # updates-testing for anything we do between here and upgrade_run 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; script_run "reboot", 0;