From 37f6021efc1dd72bf2b28d3445066c8880a62fa1 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 29 Oct 2021 13:27:31 -0400 Subject: [PATCH] bodhi-pungi: add Kinoite to the bodhi pungi runs. Right now they are only Fedora 35+. --- .../backend/templates/pungi.rpm.conf.j2 | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index e49949b7db..2999e44e70 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -177,6 +177,37 @@ ostree = { "arches": ["x86_64", "ppc64le", "aarch64" ], "failable": ["x86_64", "ppc64le", "aarch64" ] }, + # Fedora Kinoite + [% if release.version_int >= 35 %] + { + "version": "!VERSION_FROM_VERSION_DATE_RESPIN", + "treefile": "fedora-kinoite.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f[[ release.version ]]", + "repo": [ + "Everything", + [% 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 F36 the compose location is going to be under /compose/branched/ + [% if release.version_int == 36 %] + "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 %] + ] + "ostree_repo": "/mnt/koji/compose/ostree/repo", + [% if request.name == 'stable' %] + "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/kinoite", + [% else %] + "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/kinoite", + [% endif %] + "tag_ref": False, + "arches": ["x86_64", "ppc64le", "aarch64" ], + "failable": ["x86_64", "ppc64le", "aarch64" ] + }, + [% endif %] ] } [% endif %]