From d7cb42beae4db4fb85f88aa92463e88aa2f56260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 14 Dec 2023 11:15:58 +0100 Subject: [PATCH] bodhi2/pungi.rpm.conf.j2: Enable unified-core only for F39+ Fixes: https://pagure.io/fedora-infra/ansible/pull-request/1697 --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index b2ac50c000..58cbc9fc66 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -139,8 +139,10 @@ ostree = { # Fedora Silverblue { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", + [% if release.version_int >= 39 %] "unified_core": True, "runroot_packages": ["selinux-policy-targeted"], + [% endif %] "treefile": "fedora-silverblue.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", @@ -171,8 +173,10 @@ ostree = { [% if release.version_int >= 35 %] { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", + [% if release.version_int >= 39 %] "unified_core": True, "runroot_packages": ["selinux-policy-targeted"], + [% endif %] "treefile": "fedora-kinoite.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", @@ -204,8 +208,10 @@ ostree = { [% if release.version_int >= 38 %] { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", + [% if release.version_int >= 39 %] "unified_core": True, "runroot_packages": ["selinux-policy-targeted"], + [% endif %] "treefile": "fedora-sericea.yaml", "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]",