Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi: quick fix for DRPMs disabled in F40

Browse source 
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
This commit is contained in:
Mattia Verga 2024-02-28 18:51:06 +01:00
parent 78d578199c
commit bbde45f158
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/bodhi2/backend/files/createrepo_c.ini
View file

@ -13,6 +13,8 @@ repodata-compress-type =
general-compress = False general-compress = False
# zchunk is a boolean which enables zchunk on repodata # zchunk is a boolean which enables zchunk on repodata
zchunk = True zchunk = True
# drpms_enabled is a boolean which enables DRPMs generation
drpms_enabled = True
# Here you can override default values by matching Release.prefix_id or Release.name # Here you can override default values by matching Release.prefix_id or Release.name
# If a value is not overridden, those from DEFAULT are used # If a value is not overridden, those from DEFAULT are used
@ -26,3 +28,6 @@ zchunk = False
updateinfo-compress-type = BZ2 updateinfo-compress-type = BZ2
repodata-compress-type = xz repodata-compress-type = xz
zchunk = False zchunk = False
[release.F40]
drpms_enabled = False

6
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
View file

@ -85,13 +85,13 @@ check_deps = False
repoclosure_backend = 'dnf' repoclosure_backend = 'dnf'
# CREATEREPO # CREATEREPO
[% if release.version_int >= 40 %] [% if cr_config.drpms_enabled %]
createrepo_deltas = [ createrepo_deltas = [
('^Everything$', {'*': False}) ('^Everything$', {'*': True})
] ]
[% else %] [% else %]
createrepo_deltas = [ createrepo_deltas = [
('^Everything$', {'*': True}) ('^Everything$', {'*': False})
] ]
[% endif %] [% endif %]
createrepo_database = True createrepo_database = True

4
roles/openshift-apps/bodhi/templates/dockerfile-base
View file

@ -23,6 +23,10 @@ RUN dnf install -y bodhi-server-{{bodhi_version}} python3-pyramid_sawing python3
RUN curl https://github.com/fedora-infra/bodhi/commit/0c302e26003756544f63bbeba016f75f3f037a03.patch -o /tmp/dbTimeout.patch RUN curl https://github.com/fedora-infra/bodhi/commit/0c302e26003756544f63bbeba016f75f3f037a03.patch -o /tmp/dbTimeout.patch
RUN patch -p3 -ruN -d /usr/lib/python3.11/site-packages/bodhi < /tmp/dbTimeout.patch RUN patch -p3 -ruN -d /usr/lib/python3.11/site-packages/bodhi < /tmp/dbTimeout.patch
# Hotfix for disabled DRPMs in F40
RUN curl https://github.com/mattiaverga/bodhi/commit/7c1a32be013bfe529977c141e6b4206a6dfbb256.patch -o /tmp/dprms.patch
RUN patch -p3 -ruN -d /usr/lib/python3.11/site-packages/bodhi < /tmp/dprms.patch
# link the static files for a simpler httpd.conf # link the static files for a simpler httpd.conf
RUN ln -s $(python3 -Ic "import sysconfig; print(sysconfig.get_path('purelib', 'rpm_prefix'))")/bodhi/server/static/ /srv/bodhi-static RUN ln -s $(python3 -Ic "import sysconfig; print(sysconfig.get_path('purelib', 'rpm_prefix'))")/bodhi/server/static/ /srv/bodhi-static