Revert all the bodhi shared pungi config commits

It seems that there are still some problems, although the composes are finished,
the sanity checks are failing. For more info see https://pagure.io/fedora-infrastructure/issue/10779

This reverts commit 73cd22d012.
This reverts commit be634e0ec3.
This reverts commit 2b01f82163.

roles/bodhi2/backend/tasks/main.yml

@@ -69,23 +69,6 @@
   - bodhi/pungi
   - config
 
-- name: Put pungi multilib configuration in place
-  copy:
-    src: pungi_multilib.conf
-    dest: /etc/bodhi/pungi_multilib.conf
-  tags:
-  - bodhi
-  - bodhi/pungi
-  - config
-
-- name: Put pungi general configuration in place
-  copy:
-    src: pungi_general.conf
-    dest: /etc/bodhi/pungi_general.conf
-  tags:
-  - bodhi
-  - bodhi/pungi
-  - config
 #
 # koji ssl cert for owner sync jobs below
 #

roles/bodhi2/backend/templates/pungi.general.conf.j2

@@ -1,3 +1,10 @@
+# PRODUCT INFO
+release_name = '[[ release.id_prefix.title() ]]'
+release_short = '[[ release.id_prefix.title() ]]'
+release_is_layered = False
+
+hashed_directories = True
+
 # PKGSET
 pkgset_source = 'koji' # koji, repos
 filter_system_release_packages = False

roles/bodhi2/backend/templates/pungi.module.conf.j2

@@ -1,18 +1,10 @@
-# Import shared settings from pungi_general.conf
-from pungi_general import *
-# Import multilib settings from pungi_multilib.conf
-from pungi_multilib import *
-
 # PRODUCT INFO
-release_version = '[[ release.version ]]'
-release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 release_name = '[[ release.id_prefix.title() ]]'
 release_short = '[[ release.id_prefix.title() ]]'
+release_version = '[[ release.version ]]'
+release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 release_is_layered = False
 
-hashed_directories = True
-
-
 # GENERAL SETTINGS
 bootable = False
 
@@ -90,6 +82,8 @@ module_obsoletes_dir = {
     'dir': 'obsoletes'
 }
 
+hashed_directories = True
+
 # RUNROOT settings
 runroot = False
 
@@ -98,12 +92,20 @@ pdc_url = 'https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1'
 pdc_insecure = False
 pdc_develop = True
 
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+filter_system_release_packages = False
+
 # GATHER
 gather_method = 'nodeps'
 gather_profiler = True
 check_deps = False
+greedy_method = 'build'
 
 # CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
 createrepo_deltas = False
 [% if release.version_int >= 30 %]
 createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]']

roles/bodhi2/backend/templates/pungi.rpm.conf.j2

@@ -1,16 +1,11 @@
-# Import shared settings from pungi_general.conf
-from pungi_general import *
-# Import multilib settings from pungi_multilib.conf
-from pungi_multilib import *
-
 # PRODUCT INFO
 skip_phases = ["buildinstall", "extra_files"]
-release_version = '[[ release.version_int ]]'
-release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
-old_composes_per_release_type = True
 release_name = '[[ release.id_prefix.title() ]]'
 release_short = '[[ release.id_prefix.title() ]]'
+release_version = '[[ release.version_int ]]'
+release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 release_is_layered = False
+old_composes_per_release_type = True
 
 # GENERAL SETTINGS
 comps_file = {
@@ -63,6 +58,7 @@ sigkeys = [
     None
 {% endif %}
 ]
+hashed_directories = True
 comps_filter_environments = False
 
 # RUNROOT settings
@@ -71,17 +67,22 @@ runroot_channel = 'compose'
 runroot_tag = 'f[[ release.version_int ]]-build'
 
 # PKGSET
+pkgset_source = 'koji' # koji, repos
 pkgset_koji_tag = '[[ id ]]'
 pkgset_koji_inherit = False
 pkgset_allow_reuse = False
+filter_system_release_packages = False
 
 # GATHER
 gather_method = 'deps'
 gather_backend = 'dnf'
 check_deps = False
+greedy_method = 'build'
 repoclosure_backend = 'dnf'
 
 # CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
 createrepo_deltas = [
     ('^Everything$', {'*': True})
 ]
@@ -118,6 +119,90 @@ multilib = [
 ]
 filter_packages = []
 
+# Note: If you change something here (affects updates for stable releases), also
+# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
+# we want to keep them in sync:
+# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+#
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': [
+        'dmraid-devel',
+        'ghc-*',
+        'httpd-core',
+        'httpd-devel',
+        'java-1.5.0-gcj-devel',
+        'java-1.6.0-openjdk-devel',
+        'java-1.7.0-icedtea-devel',
+        'java-1.7.0-openjdk-devel',
+        'java-1.8.0-openjdk-devel',
+        'kdeutils-devel',
+        'kernel*',
+        'kernel*debug*',
+        'kernel-PAE*',
+        'krb5-server',
+        'krb5-server-ldap',
+        'mkinitrd-devel',
+        'mod_*',
+        'mp',
+        'php*',
+        'php-devel',
+        'tomcat-native',
+        ],
+}
+
+# Note: If you change something here (affects updates for stable releases), also
+# submit the same change to pungi-fedora (affects Rawhide/Branched composes),
+# we want to keep them in sync:
+# https://pagure.io/pungi-fedora/blob/main/f/multilib.conf
+#
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': [
+        '*-static',
+        'apitrace-libs',
+        'compiler-rt',
+        'dssi-vst-wine',
+        'fakechroot-libs',
+        'fakeroot-libs',
+        'glib-networking',
+        'glx-utils',
+        'ibus-gtk2',
+        'ibus-gtk3',
+        'ibus-libs',
+        'iptables',
+        'libflashsupport',
+        'libgnat',
+        'libomp',
+        'lmms-vst',
+        'mangohud',
+        'mariadb-connector-odbc',
+        'mesa-dri-drivers',
+        'mesa-va-drivers',
+        'mesa-vdpau-drivers',
+        'mesa-vulkan-drivers',
+        'mysql-connector-odbc',
+        'nosync',
+        'nspluginwrapper',
+        'nvidia-query-resource-opengl-lib',
+        'p11-kit-trust',
+        'pam',
+        'perl-libs',
+        'pipewire',
+        'postgresql-odbc',
+        'redhat-lsb',
+        'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux',
+        'syslinux-tftpboot',
+        'systemd-pam',
+        'valgrind',
+        'vkBasalt',
+        'wine',
+        'wine-*',
+        'yaboot',
+        ],
+}
+
 createiso_skip = [
         ('^Everything$', {
             '*': True,