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

Fix up Atomic Host and add Atomic Workstation to bodhi pungi

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2017-11-16 15:24:58 +00:00
parent 169278f5fa
commit b2a87216bc
1 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,20 +107,10 @@ createiso_skip = [
] ]
[% if release.id_prefix == 'FEDORA' and release.version_int >= 26 %] [% if release.id_prefix == 'FEDORA' and release.version_int >= 26 %]
[% if release.version_int >= 27 %] ostree = {
[% set ostree_arches = ['x86_64', 'ppc64le', 'aarch64'] %] "^Everything$": [
[% else %] # Atomic Host
[% set ostree_arches = ['x86_64'] %] {
[% endif %]
ostree = [
("^Everything$", {
[% for arch in ostree_arches %]
[% if arch == "x86_64" %]
[% set path = "fedora/linux" %]
[% else %]
[% set path = "fedora-secondary" %]
[% endif %]
"[[ arch ]]": {
[% if release.version_int >= 28 %] [% if release.version_int >= 28 %]
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
[% endif %] [% endif %]
@ -131,19 +121,41 @@ ostree = [
"Everything", "Everything",
[% if request.name == 'testing' %] [% if request.name == 'testing' %]
# 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/pub/[[ path ]]/updates/[[ release.version ]]/[[ arch ]]/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
[% endif %]
[% if release.version_int == 27 %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/[[ path ]]/development/[[ release.version_int ]]/Everything/[[ arch ]]/os/"
[% else %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/pub/[[ path ]]/releases/[[ release.version_int ]]/Everything/[[ arch ]]/os/"
[% endif %] [% endif %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
] ]
"ostree_repo": "/mnt/koji/compose/updates/atomic", "ostree_repo": "/mnt/koji/compose/updates/atomic",
"tag_ref": False "tag_ref": False,
"arches": ["x86_64",
[% if release.version_int >= 27 %]
"ppc64le", "aarch64"
[% endif %]
]
}, },
[% endfor %] # Atomic Workstation
}) [% if release.version_int >= 27 %]
{
[% if release.version_int >= 28 %]
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
[% endif %]
"treefile": "fedora-ostree-workstation-[[ request.name ]].json",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": [
"Everything",
[% if request.name == 'testing' %]
# 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/",
[% endif %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
]
"ostree_repo": "/mnt/koji/compose/updates/atomic",
"tag_ref": False,
"arches": ["x86_64"]
},
[% endif %]
]}
] ]
[% endif %] [% endif %]