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

Bodhi compose config: factor out a repeated conditional

Browse source 
This just makes things a bit more readable, I think.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-04-30 11:19:21 -07:00
parent 8e05d07ca6
commit 475c3a54d6
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,12 @@ createiso_skip = [
[% endif %] [% endif %]
]' %} ]' %}
[% if request.name == 'stable' %]
[% set ostreeref = 'updates' %]
[% else %]
[% set ostreeref = 'testing' %]
[% endif %]
{% if env != "staging" %} {% if env != "staging" %}
[% if release.id_prefix == 'FEDORA' %] [% if release.id_prefix == 'FEDORA' %]
ostree = { ostree = {
@ -144,11 +150,7 @@ ostree = {
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
"repo": {{ repos }}, "repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
[% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/silverblue",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
[% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64", "ppc64le", "aarch64" ], "arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["x86_64", "ppc64le", "aarch64" ] "failable": ["x86_64", "ppc64le", "aarch64" ]
@ -165,11 +167,7 @@ ostree = {
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
"repo": {{ repos }}, "repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
[% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/kinoite",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/kinoite",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/kinoite",
[% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64", "ppc64le", "aarch64" ], "arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["x86_64", "ppc64le", "aarch64" ] "failable": ["x86_64", "ppc64le", "aarch64" ]
@ -186,11 +184,7 @@ ostree = {
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
"repo": {{ repos }}, "repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
[% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/sericea",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/sericea",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/sericea",
[% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"failable": ["x86_64", "aarch64"] "failable": ["x86_64", "aarch64"]
@ -206,11 +200,7 @@ ostree = {
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
"repo": {{ repos }}, "repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
[% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/onyx",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/onyx",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/onyx",
[% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64"], "arches": ["x86_64"],
"failable": ["x86_64"] "failable": ["x86_64"]