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

bodhi pungi ostree: point to different repos for f28

Browse source 
The f28 repos we need to tap into are not in the same locations
as for post release (f26/f27) runs.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
Dusty Mabe 2018-03-09 14:59:13 -05:00
parent 5bbb1c5f5e
commit aaa694f7e4
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,12 @@ ostree = {
# In the case of testing, also inject the last stable updates # In the case of testing, also inject the last stable updates
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
[% endif %] [% endif %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" # For f28 the compose location is under /compose/branched/
[% if release.version_int == 28 %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
[% else %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
[% endif %]
] ]
"ostree_repo": "/mnt/koji/compose/atomic/repo", "ostree_repo": "/mnt/koji/compose/atomic/repo",
"tag_ref": False, "tag_ref": False,
@ -155,7 +160,12 @@ ostree = {
# In the case of testing, also inject the last stable updates # In the case of testing, also inject the last stable updates
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
[% endif %] [% endif %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" # For f28 the compose location is under /compose/branched/
[% if release.version_int == 28 %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
[% else %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
[% endif %]
] ]
"ostree_repo": "/mnt/koji/compose/atomic/repo", "ostree_repo": "/mnt/koji/compose/atomic/repo",
"tag_ref": False, "tag_ref": False,