infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Reapply fixed "Don't hardcode the branched number in Bodhi compose repo config"

Browse source 
This reverts commit 6d4c6b0be1, but
fixes the problem.
This commit is contained in:
Adam Williamson 2025-02-19 10:59:09 -08:00 • committed by kevin
parent d63afb09d8
commit 6102284c0d
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -144,18 +144,20 @@ createiso_skip = [
]
{# repo block used by every image #}
{# we never compose Rawhide, so it doesn't matter that this is "wrong" for Rawhide #}
{# when Branched doesn't exist its number is 0 so that condition will not match wrongly #}
{% set repos = '[
[% if request.name == "testing" %]
[# In the case of testing, also inject the last stable updates #]
"https://kojipkgs{env_suffix}.fedoraproject.org/compose/updates/f[[ release.version ]]-updates/compose/Everything/$basearch/os/",
[% endif %]
[% if release.version == "42" %]
[# For F42 the compose location is going to be under /compose/branched/ #]
[% if release.version == "{FedoraBranchedNumber}" %]
[# For F{FedoraBranchedNumber} the compose location is going to be under /compose/branched/ #]
"https://kojipkgs{env_suffix}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version ]]/compose/Everything/$basearch/os/"
[% else %]
"https://kojipkgs{env_suffix}.fedoraproject.org/compose/[[ release.version ]]/latest-Fedora-[[ release.version ]]/compose/Everything/$basearch/os/"
[% endif %]
]'.format(env_suffix=env_suffix) %}
]'.format(env_suffix=env_suffix, FedoraBranchedNumber=FedoraBranchedNumber) %}
[% if request.name == 'stable' %]
[% set ostreeref = 'updates' %]