infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

bodhi2/pungi.rpm.conf.j2: Update for F38 EOL

Browse source 
Remove conditions that are always true now that Fedora 38 is EOL.
This commit is contained in:
Timothée Ravier 2024-05-02 13:14:58 +02:00
parent d3f9eab14c
commit 9be1a293e7
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
View file

@ -148,10 +148,8 @@ createiso_skip = [
ostree = { ostree = {
"^Silverblue$": { "^Silverblue$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True, "unified_core": True,
"runroot_packages": ["selinux-policy-targeted"], "runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-silverblue.yaml", "treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
@ -164,10 +162,8 @@ ostree = {
}, },
"^Kinoite$": { "^Kinoite$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True, "unified_core": True,
"runroot_packages": ["selinux-policy-targeted"], "runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-kinoite.yaml", "treefile": "fedora-kinoite.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
@ -180,10 +176,8 @@ ostree = {
}, },
"^Sericea$": { "^Sericea$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True, "unified_core": True,
"runroot_packages": ["selinux-policy-targeted"], "runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-sericea.yaml", "treefile": "fedora-sericea.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
@ -194,7 +188,6 @@ ostree = {
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"failable": ["x86_64", "aarch64"] "failable": ["x86_64", "aarch64"]
}, },
[% if release.version_int >= 39 %]
"^Onyx$": { "^Onyx$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"unified_core": True, "unified_core": True,
@ -209,7 +202,6 @@ ostree = {
"arches": ["x86_64"], "arches": ["x86_64"],
"failable": ["x86_64"] "failable": ["x86_64"]
}, },
[% endif %]
} }
[% if release.version_int >= 40 %] [% if release.version_int >= 40 %]
ostree_container = { ostree_container = {