From b9ccb3c54ae1c929b58e08ee4558659162273e86 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: May 01 2024 06:07:34 +0000 Subject: Bodhi compose config: factor out repo definitions We repeat this exact same repo definition block eight times, let's just make it a variable (at the ansible template level). Signed-off-by: Adam Williamson --- diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index f4f1b97..98da504 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -138,6 +138,20 @@ createiso_skip = [ }), ] +{# repo block used by every image #} +{% 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_int ]]-updates/compose/Everything/$basearch/os/", + [% endif %] + [% if release.version_int == 41 %] + [# For F41 the compose location is going to be under /compose/branched/ #] + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + [% else %] + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" + [% endif %] + ]' %} + {% if env != "staging" %} [% if release.id_prefix == 'FEDORA' %] ostree = { @@ -152,18 +166,7 @@ ostree = { "treefile": "fedora-silverblue.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ] + "repo": {{ repos }}, "ostree_repo": "/mnt/koji/compose/ostree/repo", [% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue", @@ -184,18 +187,7 @@ ostree = { "treefile": "fedora-kinoite.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ] + "repo": {{ repos }}, "ostree_repo": "/mnt/koji/compose/ostree/repo", [% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/kinoite", @@ -216,18 +208,7 @@ ostree = { "treefile": "fedora-sericea.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ] + "repo": {{ repos }}, "ostree_repo": "/mnt/koji/compose/ostree/repo", [% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/sericea", @@ -247,18 +228,7 @@ ostree = { "treefile": "fedora-onyx.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ] + "repo": {{ repos }}, "ostree_repo": "/mnt/koji/compose/ostree/repo", [% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/onyx", @@ -280,18 +250,7 @@ ostree_container = { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ], + "repo": {{ repos }}, "treefile": "fedora-silverblue.yaml", "arches": ["x86_64", "ppc64le", "aarch64"], "failable": ['*'], @@ -301,18 +260,7 @@ ostree_container = { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ], + "repo": {{ repos }}, "treefile": "fedora-kinoite.yaml", "arches": ["x86_64", "ppc64le", "aarch64"], "failable": ['*'], @@ -322,18 +270,7 @@ ostree_container = { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ], + "repo": {{ repos }}, "treefile": "fedora-sericea.yaml", "arches": ["x86_64", "aarch64"], "failable": ['*'], @@ -343,18 +280,7 @@ ostree_container = { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", - "repo": [ - [% 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_int ]]-updates/compose/Everything/$basearch/os/", - [% endif %] - # For F41 the compose location is going to be under /compose/branched/ - [% if release.version_int == 41 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] - ], + "repo": {{ repos }}, "treefile": "fedora-onyx.yaml", "arches": ["x86_64"], "failable": ['*'],