rpms/pyproject-rpm-macros
5
0
Fork 0
Code Issues Pull Requests Releases Activity

CI: Regardless of the package manager, use dnf.conf in mock config

Browse Source 
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

(cherry picked from commit fa7c91c65d)
This commit is contained in:
Miro Hrončok 2024-04-11 12:31:17 +02:00
parent 2f641d6866
commit 8763e77d15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mocktest.sh
View File

@ -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-<pkgname>.repo