From 9be1a293e7ce1d4f07c425c7fa1bb0f5fa6a4517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 2 May 2024 13:14:58 +0200 Subject: [PATCH] bodhi2/pungi.rpm.conf.j2: Update for F38 EOL Remove conditions that are always true now that Fedora 38 is EOL. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 91edf149fa..4a8fd95f01 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -148,10 +148,8 @@ createiso_skip = [ ostree = { "^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 ]]", @@ -164,10 +162,8 @@ ostree = { }, "^Kinoite$": { "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 ]]", @@ -180,10 +176,8 @@ ostree = { }, "^Sericea$": { "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 ]]", @@ -194,7 +188,6 @@ ostree = { "arches": ["x86_64", "aarch64"], "failable": ["x86_64", "aarch64"] }, - [% if release.version_int >= 39 %] "^Onyx$": { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "unified_core": True, @@ -209,7 +202,6 @@ ostree = { "arches": ["x86_64"], "failable": ["x86_64"] }, - [% endif %] } [% if release.version_int >= 40 %] ostree_container = {