Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi-pungi: simplify now that f27 is EOL

Browse source 
Removes conditional logic that considers f27.
This commit is contained in:
Dusty Mabe 2019-01-08 13:54:44 -05:00
parent 7c8ef39653
commit 2b93c4d1a6
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,14 +118,12 @@ createiso_skip = [
] ]
{% if env != "staging" %} {% if env != "staging" %}
[% if release.id_prefix == 'FEDORA' and release.version_int >= 26 %] [% if release.id_prefix == 'FEDORA' %]
ostree = { ostree = {
"^Everything$": [ "^Everything$": [
# Atomic Host # Atomic Host
{ {
[% if release.version_int >= 28 %]
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% endif %]
"force_new_commit": True "force_new_commit": True
"treefile": "fedora-atomic-host.json", "treefile": "fedora-atomic-host.json",
"config_url": "https://pagure.io/fedora-atomic.git", "config_url": "https://pagure.io/fedora-atomic.git",
@ -150,26 +148,17 @@ ostree = {
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/atomic-host", "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/atomic-host",
[% endif %] [% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64", "arches": ["x86_64", "ppc64le", "aarch64" ],
[% if release.version_int >= 27 %]
"ppc64le", "aarch64"
[% endif %]
],
[% if release.version_int >= 27 %]
"failable": ["ppc64le", "aarch64"], "failable": ["ppc64le", "aarch64"],
[% endif %] [% endif %]
}, },
# Fedora Silverblue # Fedora Silverblue
{ {
[% if release.version_int >= 28 %]
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% endif %]
[% if release.version_int >= 29 %] [% if release.version_int >= 29 %]
"treefile": "fedora-silverblue.yaml", "treefile": "fedora-silverblue.yaml",
[% elif release.version_int == 28 %]
"treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json",
[% else %] [% else %]
"treefile": "fedora-ostree-workstation-updates-[[ request.name ]].json", "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json",
[% endif %] [% endif %]
"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 ]]",