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

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

Browse source 
This reverts commit 13a95660e4.

Templating is wonky here.
This commit is contained in:
Kevin Fenzi 2025-02-19 10:24:10 -08:00
parent 13a95660e4
commit 6d4c6b0be1
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -144,15 +144,13 @@ 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 == "{{ FedoraBranchedNumber }}" %]
[# For F{{ FedoraBranchedNumber }} the compose location is going to be under /compose/branched/ #]
[% if release.version == "42" %]
[# For F42 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/"