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

bodhi-pungi: get rid of < f29 logic

Browse source 
We are no longer building f28 so we can remove these if statements.
This commit is contained in:
Dusty Mabe 2019-08-23 07:42:58 -04:00 • committed by Pierre-Yves Chibon
parent 57bc370035
commit 8a15a14832
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,11 +168,7 @@ ostree = {
# Fedora Silverblue # Fedora Silverblue
{ {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 29 %] "treefile": "fedora-silverblue.yaml",
"treefile": "fedora-silverblue.yaml",
[% else %]
"treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json",
[% 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 ]]",
"repo": [ "repo": [
@ -189,14 +185,10 @@ ostree = {
[% endif %] [% endif %]
] ]
"ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
# For f29+ we are changing the ref to silverblue. For f28/f27 let the files [% if request.name == 'stable' %]
# still specify the workstation ref. "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
[% if release.version_int >= 29 %] [% else %]
[% if request.name == 'stable' %] "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
[% endif %]
[% endif %] [% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64"], "arches": ["x86_64"],