From 0f4026b2a16c05ba2ea6dd768a503657bfe0b79b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Jun 2023 13:30:19 -0700 Subject: [PATCH] koji_builder: test dnf5 changes in staging With dnf5 becoming default in rawhide, we need to make sure to override things to use dnf4 for making buildroots for now until dnf5 is ready to take that on. Signed-off-by: Kevin Fenzi --- roles/koji_builder/templates/builders/site-defaults.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/koji_builder/templates/builders/site-defaults.cfg b/roles/koji_builder/templates/builders/site-defaults.cfg index 593bf758af..571489fe7f 100644 --- a/roles/koji_builder/templates/builders/site-defaults.cfg +++ b/roles/koji_builder/templates/builders/site-defaults.cfg @@ -13,3 +13,8 @@ config_opts['dnf_warning'] = False # https://bugzilla.redhat.com/show_bug.cgi?id=2123812 config_opts['nspawn_args'] += ['--capability=cap_mac_admin'] {% endif %} +{% if env == "staging" %} +config_opts['dnf_command'] = '/usr/bin/dnf-3' +config_opts['system_dnf_command'] = '/usr/bin/dnf-3' +config_opts['dnf_install_command'] = 'install python3-dnf dnf-plugins-core' +{% endif %}