From c39dc663c2d746e464363c4bd8929ccbafffe8fb Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 4 Jan 2024 18:00:27 +0100 Subject: [PATCH] Revert "copr: keep building Rawhide with DNF4 for a while" There are no known blockers for this change. So let's experiment with https://fedoraproject.org/wiki/Changes/BuildWithDNF5 in Fedora Copr This reverts commit c0e4f15946e01f4c3edef80644be38e5de9122b8. --- .../files/mock/templates/fedora-rawhide.tpl | 109 ------------------ 1 file changed, 109 deletions(-) delete mode 100644 roles/copr/backend/files/provision/files/mock/templates/fedora-rawhide.tpl diff --git a/roles/copr/backend/files/provision/files/mock/templates/fedora-rawhide.tpl b/roles/copr/backend/files/provision/files/mock/templates/fedora-rawhide.tpl deleted file mode 100644 index cb1a423e70..0000000000 --- a/roles/copr/backend/files/provision/files/mock/templates/fedora-rawhide.tpl +++ /dev/null @@ -1,109 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-{{ target_arch }}' - -# fedora 31+ isn't mirrored, we need to run from koji -config_opts['mirrored'] = config_opts['target_arch'] != 'i686' - -config_opts['chroot_setup_cmd'] = 'install @{% if mirrored %}buildsys-{% endif %}build' - -config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '40' -config_opts['package_manager'] = 'dnf' -config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:rawhide' -config_opts['description'] = 'Fedora Rawhide' - -config_opts['dnf.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -best=1 -module_platform_id=platform:f{{ releasever }} -protected_packages= -user_agent={{ user_agent }} - -{%- macro rawhide_gpg_keys() -%} -file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary -{%- for version in [releasever|int, releasever|int - 1] -%} file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-{{ version }}-primary -{%- endfor %} -{%- endmacro %} - -# repos - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/$basearch/ -cost=2000 -enabled={{ not mirrored }} -skip_if_unavailable=False - -[local-source] -name=local-source -baseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/src/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -{% if mirrored %} -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -gpgkey={{ rawhide_gpg_keys() }} -gpgcheck=1 -skip_if_unavailable=False - -[fedora-debuginfo] -name=Fedora Rawhide - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch -enabled=0 -gpgkey={{ rawhide_gpg_keys() }} -gpgcheck=1 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch -gpgkey={{ rawhide_gpg_keys() }} -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[rawhide-modular] -name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch -# if you want to enable it, you should set best=0 -# see https://bugzilla.redhat.com/show_bug.cgi?id=1673851 -enabled=0 -gpgcheck=1 -gpgkey={{ rawhide_gpg_keys() }} -skip_if_unavailable=False - -[rawhide-modular-debuginfo] -name=Fedora - Modular Rawhide - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch -enabled=0 -gpgcheck=1 -gpgkey={{ rawhide_gpg_keys() }} -skip_if_unavailable=False - -[rawhide-modular-source] -name=Fedora - Modular Rawhide - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch -enabled=0 -gpgcheck=1 -gpgkey={{ rawhide_gpg_keys() }} -skip_if_unavailable=False -{% endif %} -"""