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

bodhi-pungi: specify ostree ref in config and updates for f29

Browse source 
Now that we can specify the ostree_ref in the config we can stop
having to choose various fedora-atomic-host-updates-{stable,testing}.json
files.

For silverblue we are also changing the ref to silverblue away from
workstation so we'll only specify ostree_ref if f29+ and let the json
files still specify "workstation" for f27 and f28.
This commit is contained in:
Dusty Mabe 2018-08-29 14:53:35 -04:00
parent cfc1e96bdd
commit bf1ad05777
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,7 +121,7 @@ ostree = {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% endif %] [% endif %]
"force_new_commit": True "force_new_commit": True
"treefile": "fedora-atomic-host-updates-[[ request.name ]].json", "treefile": "fedora-atomic-host.json",
"config_url": "https://pagure.io/fedora-atomic.git", "config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
"repo": [ "repo": [
@ -138,6 +138,11 @@ ostree = {
[% endif %] [% endif %]
] ]
"ostree_repo": "/mnt/koji/compose/atomic/repo", "ostree_repo": "/mnt/koji/compose/atomic/repo",
[% if request.name == 'stable' %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/atomic-host",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/atomic-host",
[% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64", "arches": ["x86_64",
[% if release.version_int >= 27 %] [% if release.version_int >= 27 %]
@ -154,11 +159,13 @@ ostree = {
[% if release.version_int >= 28 %] [% if release.version_int >= 28 %]
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% endif %] [% endif %]
[% if release.version_int >= 28 %] [% if release.version_int >= 29 %]
"treefile": "fedora-silverblue.json",
[% elif release.version_int == 28 %]
"treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json", "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json",
[% else %] [% else %]
"treefile": "fedora-ostree-workstation-updates-[[ request.name ]].json", "treefile": "fedora-ostree-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 ]]",
"repo": [ "repo": [
@ -175,6 +182,15 @@ ostree = {
[% endif %] [% endif %]
] ]
"ostree_repo": "/mnt/koji/compose/atomic/repo", "ostree_repo": "/mnt/koji/compose/atomic/repo",
# For f29+ we are changing the ref to silverblue. For f28/f27 let the files
# still specify the workstation ref.
[% if release.version_int >= 29 %]
[% if request.name == 'stable' %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
[% else %]
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
[% endif %]
[% endif %]
"tag_ref": False, "tag_ref": False,
"arches": ["x86_64"], "arches": ["x86_64"],
"failable": ["x86_64"] "failable": ["x86_64"]