From fdcceefacb632fe3e324c6e27508fbbfe94d1e12 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 3 May 2023 18:46:26 -0700 Subject: [PATCH] bodhi-backend: revert all the template stuff again Still not working. ;( So, next time we think we have this, we should push it out and make sure to push one updates-testing or something to actually make sure it works! Signed-off-by: Kevin Fenzi --- roles/bodhi2/backend/tasks/main.yml | 10 -- .../backend/templates/pungi.module.conf.j2 | 18 +++- .../backend/templates/pungi.rpm.conf.j2 | 98 ++++++++++++++++++- 3 files changed, 106 insertions(+), 20 deletions(-) diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index b8e811f615..11ef8f66c4 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -60,7 +60,6 @@ - name: Put pungi configurations in place template: src="{{item}}" dest=/etc/bodhi/{{item}} with_items: - - pungi.general.conf.j2 - pungi.module.conf.j2 - pungi.rpm.conf.j2 - variants.module.xml.j2 @@ -70,15 +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 - # # koji ssl cert for owner sync jobs below # diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index 905eb5b631..a2db5ef30a 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -1,11 +1,9 @@ -# 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_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 # GENERAL SETTINGS bootable = False @@ -84,6 +82,8 @@ module_obsoletes_dir = { 'dir': 'obsoletes' } +hashed_directories = True + # RUNROOT settings runroot = False @@ -92,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 ]]'] diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 752b39475f..11724068c6 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -1,12 +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 skip_phases = ["buildinstall", "extra_files"] +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 @@ -60,6 +58,7 @@ sigkeys = [ None {% endif %} ] +hashed_directories = True comps_filter_environments = False # RUNROOT settings @@ -68,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}) ] @@ -115,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,