From 9b2da0d73d4d012b9410db735488523d70e90663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 15 Nov 2024 12:02:54 +0100
Subject: [PATCH] roles/bodhi2/pungi: Update to new Atomic Desktops manifest
 names

- Use the container manifests for the container builds
- Use the new names for the classic ostree builds

See: https://pagure.io/pungi-fedora/pull-request/1292
---
 .../backend/templates/pungi.rpm.conf.j2       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 9039598c84..fe72501cf0 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -164,7 +164,11 @@ ostree = {
         "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
         "unified_core": True,
         "runroot_packages": ["selinux-policy-targeted"],
+        [% if release.version_int >= 41 %]
+        "treefile": "silverblue-ostree.yaml",
+        [% else %]
         "treefile": "fedora-silverblue.yaml",
+        [% endif %]
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
@@ -178,7 +182,11 @@ ostree = {
         "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
         "unified_core": True,
         "runroot_packages": ["selinux-policy-targeted"],
+        [% if release.version_int >= 41 %]
+        "treefile": "kinoite-ostree.yaml",
+        [% else %]
         "treefile": "fedora-kinoite.yaml",
+        [% endif %]
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
@@ -192,7 +200,11 @@ ostree = {
         "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
         "unified_core": True,
         "runroot_packages": ["selinux-policy-targeted"],
+        [% if release.version_int >= 41 %]
+        "treefile": "sway-atomic-ostree.yaml",
+        [% else %]
         "treefile": "fedora-sericea.yaml",
+        [% endif %]
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
@@ -206,7 +218,11 @@ ostree = {
         "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
         "unified_core": True,
         "runroot_packages": ["selinux-policy-targeted"],
+        [% if release.version_int >= 41 %]
+        "treefile": "budgie-atomic-ostree.yaml",
+        [% else %]
         "treefile": "fedora-onyx.yaml",
+        [% endif %]
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
@@ -224,7 +240,11 @@ ostree_container = {
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
+        [% if release.version_int >= 41 %]
+        "treefile": "silverblue.yaml",
+        [% else %]
         "treefile": "fedora-silverblue.yaml",
+        [% endif %]
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
     },
@@ -233,7 +253,11 @@ ostree_container = {
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
+        [% if release.version_int >= 41 %]
+        "treefile": "kinoite.yaml",
+        [% else %]
         "treefile": "fedora-kinoite.yaml",
+        [% endif %]
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
     },
@@ -242,7 +266,11 @@ ostree_container = {
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
+        [% if release.version_int >= 41 %]
+        "treefile": "sway-atomic.yaml",
+        [% else %]
         "treefile": "fedora-sericea.yaml",
+        [% endif %]
         "arches": ["x86_64", "aarch64"],
         "failable": ['*'],
     },
@@ -251,7 +279,11 @@ ostree_container = {
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "f[[ release.version ]]",
         "repo": {{ repos }},
+        [% if release.version_int >= 41 %]
+        "treefile": "budgie-atomic.yaml",
+        [% else %]
         "treefile": "fedora-onyx.yaml",
+        [% endif %]
         "arches": ["x86_64"],
         "failable": ['*'],
     },