From 2d1b0565082991c6e5e957a02805fea173e4008a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Nov 2019 15:11:10 +0100 Subject: [PATCH 1/2] Add workaround for DNF fail-safe mechanism Fixes #1525 --- module_build_service/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module_build_service/config.py b/module_build_service/config.py index 6bffc751..34bc2103 100644 --- a/module_build_service/config.py +++ b/module_build_service/config.py @@ -182,6 +182,9 @@ class Config(object): # https://pagure.io/fedora-infrastructure/issue/7620. # Disables systemd-nspawn for chroot. "mock.new_chroot": 0, + # Works around fail-safe mechanism added in DNF 4.2.7 + # https://pagure.io/fedora-infrastructure/issue/8410 + "mock.yum.module_hotfixes": 1, }, "desc": "Extra options set for newly created Koji tags.", }, From 0a0c1266a1f4c11d5b87a1bf51df9da641ab1e16 Mon Sep 17 00:00:00 2001 From: Brendan Reilly Date: Tue, 4 Feb 2020 14:20:18 -0500 Subject: [PATCH 2/2] Updated koji tests for new mock option --- tests/test_builder/test_koji.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py index 08b6f1f0..61ba4639 100644 --- a/tests/test_builder/test_koji.py +++ b/tests/test_builder/test_koji.py @@ -639,6 +639,7 @@ class TestKojiBuilder: "mock.package_manager": "dnf", "repo_include_all": repo_include_all, "mock.new_chroot": 0, + 'mock.yum.module_hotfixes': 1, }, ), mock.call( @@ -648,6 +649,7 @@ class TestKojiBuilder: "mock.package_manager": "dnf", "repo_include_all": repo_include_all, "mock.new_chroot": 0, + 'mock.yum.module_hotfixes': 1, }, ), ]