From 0bde466014c921284c53829e111628698a863c9d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 29 Apr 2024 13:41:34 -0700
Subject: [PATCH] Have Bodhi composes include atomic desktop containers on f40+

Since Fedora 40, we've built native OCI containers for the atomic
desktops in the pre-release nightly and release composes. We
should also build native containers in the post-release nightly
composes that Bodhi runs. This should allow us to get rid of the
on-the-fly OCI image generation in the sync-ostree-base-containers
script.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 .../backend/templates/pungi.rpm.conf.j2       | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index c024be3eb3..178c83612a 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -272,6 +272,90 @@ ostree = {
         [% endif %]
     ]
 }
+[% 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": ['*'],
+    },
+}
+[% endif %]
 [% endif %]
 
 {% endif %}