[bodhi-backend] Add shared pungi configs
This will add shared pungi configs for Bodhi. One for multilib changes and for general settings. Let's make it correctly this time.
This commit is contained in:
Michal Konečný
parent
eb2b92002c
commit
8e58264d20
5 changed files with 131 additions and 106 deletions
15
roles/bodhi2/backend/files/pungi_general.conf
Normal file
15
roles/bodhi2/backend/files/pungi_general.conf
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
# PRODUCT INFO
|
||||||
|
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'
|
||||||
84
roles/bodhi2/backend/files/pungi_multilib.conf
Normal file
84
roles/bodhi2/backend/files/pungi_multilib.conf
Normal file
|
|
@ -0,0 +1,84 @@
|
||||||
|
# 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/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',
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
@ -69,6 +69,23 @@
|
||||||
- bodhi/pungi
|
- bodhi/pungi
|
||||||
- config
|
- 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
|
# koji ssl cert for owner sync jobs below
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,14 @@
|
||||||
|
# Import shared settings from pungi_general.conf
|
||||||
|
from pungi_general import *
|
||||||
|
# Import multilib settings from pungi_multilib.conf
|
||||||
|
from pungi_multilib import *
|
||||||
|
|
||||||
# PRODUCT INFO
|
# PRODUCT INFO
|
||||||
release_name = '[[ release.id_prefix.title() ]]'
|
|
||||||
release_short = '[[ release.id_prefix.title() ]]'
|
|
||||||
release_version = '[[ release.version ]]'
|
release_version = '[[ release.version ]]'
|
||||||
release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
|
release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
|
||||||
release_is_layered = False
|
release_name = '[[ release.id_prefix.title() ]]'
|
||||||
|
release_short = '[[ release.id_prefix.title() ]]'
|
||||||
|
|
||||||
|
|
||||||
# GENERAL SETTINGS
|
# GENERAL SETTINGS
|
||||||
bootable = False
|
bootable = False
|
||||||
|
|
@ -82,8 +87,6 @@ module_obsoletes_dir = {
|
||||||
'dir': 'obsoletes'
|
'dir': 'obsoletes'
|
||||||
}
|
}
|
||||||
|
|
||||||
hashed_directories = True
|
|
||||||
|
|
||||||
# RUNROOT settings
|
# RUNROOT settings
|
||||||
runroot = False
|
runroot = False
|
||||||
|
|
||||||
|
|
@ -92,20 +95,12 @@ pdc_url = 'https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1'
|
||||||
pdc_insecure = False
|
pdc_insecure = False
|
||||||
pdc_develop = True
|
pdc_develop = True
|
||||||
|
|
||||||
# PKGSET
|
|
||||||
pkgset_source = 'koji' # koji, repos
|
|
||||||
|
|
||||||
filter_system_release_packages = False
|
|
||||||
|
|
||||||
# GATHER
|
# GATHER
|
||||||
gather_method = 'nodeps'
|
gather_method = 'nodeps'
|
||||||
gather_profiler = True
|
gather_profiler = True
|
||||||
check_deps = False
|
check_deps = False
|
||||||
greedy_method = 'build'
|
|
||||||
|
|
||||||
# CREATEREPO
|
# CREATEREPO
|
||||||
createrepo_c = True
|
|
||||||
createrepo_checksum = 'sha256'
|
|
||||||
createrepo_deltas = False
|
createrepo_deltas = False
|
||||||
[% if release.version_int >= 30 %]
|
[% if release.version_int >= 30 %]
|
||||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]']
|
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]']
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,15 @@
|
||||||
|
# Import shared settings from pungi_general.conf
|
||||||
|
from pungi_general import *
|
||||||
|
# Import multilib settings from pungi_multilib.conf
|
||||||
|
from pungi_multilib import *
|
||||||
|
|
||||||
# PRODUCT INFO
|
# PRODUCT INFO
|
||||||
skip_phases = ["buildinstall", "extra_files"]
|
skip_phases = ["buildinstall", "extra_files"]
|
||||||
release_name = '[[ release.id_prefix.title() ]]'
|
|
||||||
release_short = '[[ release.id_prefix.title() ]]'
|
|
||||||
release_version = '[[ release.version_int ]]'
|
release_version = '[[ release.version_int ]]'
|
||||||
release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
|
release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
|
||||||
release_is_layered = False
|
|
||||||
old_composes_per_release_type = True
|
old_composes_per_release_type = True
|
||||||
|
release_name = '[[ release.id_prefix.title() ]]'
|
||||||
|
release_short = '[[ release.id_prefix.title() ]]'
|
||||||
|
|
||||||
# GENERAL SETTINGS
|
# GENERAL SETTINGS
|
||||||
comps_file = {
|
comps_file = {
|
||||||
|
|
@ -58,7 +62,6 @@ sigkeys = [
|
||||||
None
|
None
|
||||||
{% endif %}
|
{% endif %}
|
||||||
]
|
]
|
||||||
hashed_directories = True
|
|
||||||
comps_filter_environments = False
|
comps_filter_environments = False
|
||||||
|
|
||||||
# RUNROOT settings
|
# RUNROOT settings
|
||||||
|
|
@ -67,22 +70,17 @@ runroot_channel = 'compose'
|
||||||
runroot_tag = 'f[[ release.version_int ]]-build'
|
runroot_tag = 'f[[ release.version_int ]]-build'
|
||||||
|
|
||||||
# PKGSET
|
# PKGSET
|
||||||
pkgset_source = 'koji' # koji, repos
|
|
||||||
pkgset_koji_tag = '[[ id ]]'
|
pkgset_koji_tag = '[[ id ]]'
|
||||||
pkgset_koji_inherit = False
|
pkgset_koji_inherit = False
|
||||||
pkgset_allow_reuse = False
|
pkgset_allow_reuse = False
|
||||||
filter_system_release_packages = False
|
|
||||||
|
|
||||||
# GATHER
|
# GATHER
|
||||||
gather_method = 'deps'
|
gather_method = 'deps'
|
||||||
gather_backend = 'dnf'
|
gather_backend = 'dnf'
|
||||||
check_deps = False
|
check_deps = False
|
||||||
greedy_method = 'build'
|
|
||||||
repoclosure_backend = 'dnf'
|
repoclosure_backend = 'dnf'
|
||||||
|
|
||||||
# CREATEREPO
|
# CREATEREPO
|
||||||
createrepo_c = True
|
|
||||||
createrepo_checksum = 'sha256'
|
|
||||||
createrepo_deltas = [
|
createrepo_deltas = [
|
||||||
('^Everything$', {'*': True})
|
('^Everything$', {'*': True})
|
||||||
]
|
]
|
||||||
|
|
@ -119,90 +117,6 @@ multilib = [
|
||||||
]
|
]
|
||||||
filter_packages = []
|
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 = [
|
createiso_skip = [
|
||||||
('^Everything$', {
|
('^Everything$', {
|
||||||
'*': True,
|
'*': True,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue