From bb84140443446dd6a9c6ce98ca5f4a5a97e0bbf2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Apr 30 2024 17:50:42 +0000 Subject: Bodhi compose: move ostree containers under Everything variant As is currently the case for the ostrees themselves. The variants don't exist in this compose config. 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 178c836..f4f1b97 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -274,86 +274,92 @@ ostree = { } [% if release.version_int >= 40 %] ostree_container = { - "^Silverblue$": { - "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 %] - ], - "treefile": "fedora-silverblue.yaml", - "arches": ["x86_64", "ppc64le", "aarch64"], - "failable": ['*'], - }, - "^Kinoite$": { - "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 %] - ], - "treefile": "fedora-kinoite.yaml", - "arches": ["x86_64", "ppc64le", "aarch64"], - "failable": ['*'], - }, - "^Sericea$": { - "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 %] - ], - "treefile": "fedora-sericea.yaml", - "arches": ["x86_64", "aarch64"], - "failable": ['*'], - }, - "^Onyx$": { - "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 %] - ], - "treefile": "fedora-onyx.yaml", - "arches": ["x86_64"], - "failable": ['*'], - }, + "^Everything$": [ + # Fedora Silverblue + { + "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 %] + ], + "treefile": "fedora-silverblue.yaml", + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + # Fedora Kinoite + { + "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 %] + ], + "treefile": "fedora-kinoite.yaml", + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + # Fedora Sway Atomic (formerly Sericea) + { + "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 %] + ], + "treefile": "fedora-sericea.yaml", + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, + { + # Fedora Budgie Atomic (formerly Onyx) + "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 %] + ], + "treefile": "fedora-onyx.yaml", + "arches": ["x86_64"], + "failable": ['*'], + }, + ], } [% endif %] [% endif %]