From af0d1d89f3d3fe6a1f9b83f5524a79b6622be888 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Nov 2019 15:05:28 +0100 Subject: [PATCH] mbs/common: Apply workaround for DNF fail-safe mechanism in prod (#8410) --- roles/mbs/common/templates/config.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index 96dea7e30f..780cad0a59 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -148,12 +148,6 @@ class ProdConfiguration(BaseConfiguration): RPMS_DEFAULT_CACHE = 'https://src.stg.fedoraproject.org/repo/pkgs/' MODULES_DEFAULT_REPOSITORY = 'git+https://src.stg.fedoraproject.org/modules/' - KOJI_TAG_EXTRA_OPTS = { - "mock.package_manager": "dnf", - "repo_include_all": True, - "mock.new_chroot": 0, - "mock.yum.module_hotfixes": 1, - } {% else %} KOJI_PROFILE = 'production' ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x'] @@ -193,6 +187,23 @@ class ProdConfiguration(BaseConfiguration): 'scrmod', ] + # Extra options set for newly created Koji tags + KOJI_TAG_EXTRA_OPTS = { + "mock.package_manager": "dnf", + # This is needed to include all the Koji builds (and therefore + # all the packages) from all inherited tags into this tag. + # See https://pagure.io/koji/issue/588 and + # https://pagure.io/fm-orchestrator/issue/660 for background. + "repo_include_all": True, + # Has been requested by Fedora infra in + # 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, + } + # If this is too long, we could change it to 'fm_' some day. DEFAULT_DIST_TAG_PREFIX = 'module_'