rpms / pyproject-rpm-macros

Clone
Source Code
GIT

#444 [F40] CI: Regardless of the package manager, use dnf.conf in mock config
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.
rpms/ churchyard/pyproject-rpm-macros no_jinja_key  into  f40

file modified
+1 -1 
@@ -38,7 +38,7 @@ 
 

    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

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.

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/b90cdf0df417407a9dacbd14ff9eb3bb

rebased onto fa7c91c
2 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/2d1f740dbf5e4bea9a48ff642ab43d04

Pull-Request has been merged by churchyard
2 months ago
Metadata
None
No Tags
Changes Summary 1
+1 -1
file changed
tests/mocktest.sh
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.