From fa7c91c65dcee2b5cc21039533aafee4e52bde23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 11 Apr 2024 12:31:17 +0200 Subject: [PATCH] CI: Regardless of the package manager, use dnf.conf in mock config After https://github.com/rpm-software-management/mock/pull/1332 We saw: ERROR: Config error: /tmp/fedora-39-x86_64-ci.cfg: '{% if releasever|int >= 40 %}dnf5{% else %}dnf{% endif %}.conf' We cannot use the templated value of package_manager in a key. The rawhide mock config uses dnf.conf anyway, despite using dnf5. Reported to mock in https://github.com/rpm-software-management/mock/issues/1357 --- tests/mocktest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mocktest.sh b/tests/mocktest.sh index 5bcacca..c32bca3 100755 --- a/tests/mocktest.sh +++ b/tests/mocktest.sh @@ -38,7 +38,7 @@ if [ ! -f $config ]; then echo -e '\n\n' >> $config echo -e 'config_opts["package_manager_max_attempts"] = 10' >> $config echo -e 'config_opts["package_manager_attempt_delay"] = 60' >> $config - echo -e '\n\nconfig_opts[f"{config_opts.package_manager}.conf"] += """' >> $config + echo -e '\n\nconfig_opts["dnf.conf"] += """' >> $config # The zuul CI has zuul-build.repo # The Jenkins CI has test-.repo