From 725827a59dd4ed710704aa1cf2583f0a10c91310 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 19 Jan 2024 07:36:02 +0100 Subject: [PATCH] configs: BuildWithDNF5 for ELN Relates: https://pagure.io/releng/issue/11895 --- mock-core-configs/etc/mock/templates/fedora-eln.tpl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mock-core-configs/etc/mock/templates/fedora-eln.tpl b/mock-core-configs/etc/mock/templates/fedora-eln.tpl index a9fca3344..f42876910 100644 --- a/mock-core-configs/etc/mock/templates/fedora-eln.tpl +++ b/mock-core-configs/etc/mock/templates/fedora-eln.tpl @@ -12,17 +12,24 @@ config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils f config_opts['dist'] = 'eln' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['package_manager'] = 'dnf' + +# https://fedoraproject.org/wiki/Changes/BuildWithDNF5 +# https://pagure.io/releng/issue/11895 +config_opts['package_manager'] = 'dnf5' # Per https://github.com/fedora-eln/eln/issues/164 updated up to 4 times a day. # Docs: https://docs.fedoraproject.org/en-US/eln/deliverables/#_container_image config_opts['bootstrap_image'] = 'quay.io/fedoraci/fedora:eln' -# Per https://github.com/fedora-eln/eln/issues/166 -config_opts['bootstrap_image_ready'] = True + +# Used to be True per https://github.com/fedora-eln/eln/issues/166 but with +# the 'dnf5' we are switching to False, reobserve after +# https://fedoraproject.org/wiki/Changes/ReplaceDnfWithDnf5 applied to ELN! +config_opts['bootstrap_image_ready'] = False config_opts['dnf.conf'] = """ [main] keepcache=1 +system_cachedir=/var/cache/dnf debuglevel=2 reposdir=/dev/null logfile=/var/log/yum.log