From 6102284c0d5b550a4b666ff92a73478ab9634e71 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 19 Feb 2025 10:59:09 -0800 Subject: [PATCH] Reapply fixed "Don't hardcode the branched number in Bodhi compose repo config" This reverts commit 6d4c6b0be13ec1365deba1d5e05674a51481ee7f, but fixes the problem. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 1248cef206..bd66dce08b 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -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' %]