From f52e01db6ec655900ad1e693170a30ca71a8c811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 9 Aug 2023 14:30:38 +0200 Subject: [PATCH] bodhi2/backend/templates/pungi.rpm: Add Onyx config Add configuration for Onyx variant. See: https://pagure.io/pungi-fedora/blob/main/f/fedora.conf#_976 --- .../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 36cf2d915c..c0142b28c5 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -221,6 +221,37 @@ ostree = { "failable": ["x86_64"] }, [% endif %] + # Fedora Onyx + [% if release.version_int >= 39 %] + { + "version": "!VERSION_FROM_VERSION_DATE_RESPIN", + "treefile": "fedora-onyx.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 F39 the compose location is going to be under /compose/branched/ + [% if release.version_int == 39 %] + "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/onyx", + [% else %] + "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/onyx", + [% endif %] + "tag_ref": False, + "arches": ["x86_64"], + "failable": ["x86_64"] + }, + [% endif %] ] } [% endif %]