[bodhi-backend] Add shared pungi config
This will add general pungi configuration that is shared by both pungi.rpm.conf and pungi.module.conf. This is implementation of https://pagure.io/fedora-infrastructure/issue/10779. Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný
parent
d9f19e13d9
commit
be3ce8b179
4 changed files with 112 additions and 103 deletions
99
roles/bodhi2/backend/files/pungi_general.conf
Normal file
99
roles/bodhi2/backend/files/pungi_general.conf
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
# 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
|
||||
|
||||
# GATHER
|
||||
greedy_method = 'build'
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_c = True
|
||||
createrepo_checksum = 'sha256'
|
||||
|
||||
# MULTILIB
|
||||
# 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/general.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/general.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',
|
||||
'lmms-vst',
|
||||
'mangohud',
|
||||
'mariadb-connector-odbc',
|
||||
'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',
|
||||
],
|
||||
}
|
||||
|
|
@ -69,6 +69,13 @@
|
|||
- 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
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Import shared settings from pungi_general.conf
|
||||
from pungi_general 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
|
||||
|
|
@ -82,8 +82,6 @@ module_obsoletes_dir = {
|
|||
'dir': 'obsoletes'
|
||||
}
|
||||
|
||||
hashed_directories = True
|
||||
|
||||
# RUNROOT settings
|
||||
runroot = False
|
||||
|
||||
|
|
@ -92,20 +90,12 @@ 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 ]]']
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# Import shared settings from pungi_general.conf
|
||||
from pungi_general 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
|
||||
|
|
@ -58,7 +58,6 @@ sigkeys = [
|
|||
None
|
||||
{% endif %}
|
||||
]
|
||||
hashed_directories = True
|
||||
comps_filter_environments = False
|
||||
|
||||
# RUNROOT settings
|
||||
|
|
@ -67,22 +66,17 @@ 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})
|
||||
]
|
||||
|
|
@ -119,87 +113,6 @@ 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/fedora.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/fedora.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',
|
||||
'lmms-vst',
|
||||
'mangohud',
|
||||
'mariadb-connector-odbc',
|
||||
'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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue