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

Adjust bodhi pungi config to build AH only for <= F29

Browse source 
Also remove rawhide ref from robosignatory
Related: https://github.com/coreos/fedora-coreos-tracker/issues/145

Signed-off-by: Sinny Kumari <sinny@redhat.com>
This commit is contained in:
Sinny Kumari 2019-02-18 21:53:08 +05:30 • committed by Dusty Mabe
parent e0b3d419de
commit bff060b9de
No known key found for this signature in database
GPG key ID: 3302DBD73952E671
2 changed files with 11 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,9 @@ createiso_skip = [
ostree = { ostree = {
"^Everything$": [ "^Everything$": [
# Atomic Host # Atomic Host
# Atomic Host will be avilable till F29 EOL
# See https://github.com/coreos/fedora-coreos-tracker/issues/145
[% if release.version_int <= 29 %]
{ {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"force_new_commit": True "force_new_commit": True
@ -130,15 +133,10 @@ ostree = {
"config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
"repo": [ "repo": [
"Everything", "Everything",
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/",
[% 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/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 %]
# For f30 the compose location is going to be under /compose/branched/
[% if release.version_int == 30 %]
"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 %] [% endif %]
] ]
"ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
@ -151,6 +149,7 @@ ostree = {
"arches": ["x86_64", "ppc64le", "aarch64" ], "arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["ppc64le", "aarch64"], "failable": ["ppc64le", "aarch64"],
}, },
[% endif %]
# Fedora Silverblue # Fedora Silverblue
{ {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
@ -192,7 +191,7 @@ ostree = {
} }
[% endif %] [% endif %]
[% if release.id_prefix == 'FEDORA' and release.version_int >= 29 %] [% if release.id_prefix == 'FEDORA' and release.version_int == 29 %]
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f[[ release.version_int ]]' global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f[[ release.version_int ]]'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso'
@ -229,13 +228,7 @@ image_build = {
'disk_size': 6, 'disk_size': 6,
'target': 'f[[ release.version_int ]]', 'target': 'f[[ release.version_int ]]',
'arches': ['x86_64', 'aarch64', 'ppc64le'], 'arches': ['x86_64', 'aarch64', 'ppc64le'],
'install_tree_from': 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/',
# For f30 the compose location is going to be under /compose/branched/
[% if release.version_int == 30 %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/",
[% else %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/",
[% endif %]
'subvariant': 'AtomicHost', 'subvariant': 'AtomicHost',
'failable': ['*'], 'failable': ['*'],
} }
@ -262,13 +255,7 @@ image_build = {
'disk_size': 40, 'disk_size': 40,
'target': 'f[[ release.version_int ]]', 'target': 'f[[ release.version_int ]]',
'arches': ['x86_64'], 'arches': ['x86_64'],
'install_tree_from': 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/',
# For f30 the compose location is going to be under /compose/branched/
[% if release.version_int == 30 %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/",
[% else %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/",
[% endif %]
'subvariant': 'AtomicHost', 'subvariant': 'AtomicHost',
'failable': ['*'], 'failable': ['*'],
}, },
@ -285,15 +272,10 @@ ostree_installer = [
'[[ arch ]]': { '[[ arch ]]': {
"repo": [ "repo": [
"Everything", "Everything",
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/",
[% 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/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/"
[% endif %]
# For f30 the compose location is going to be under /compose/branched/
[% if release.version_int == 30 %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/"
[% else %]
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/"
[% endif %] [% endif %]
], ],
'release': None, 'release': None,

12
roles/robosignatory/files/robosignatory.production.py
View file

@ -453,18 +453,6 @@ config = {
'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/',
'key': 'fedora-29' 'key': 'fedora-29'
}, },
'fedora/rawhide/x86_64/atomic-host': {
'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/',
'key': 'fedora-30'
},
'fedora/rawhide/ppc64le/atomic-host': {
'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/',
'key': 'fedora-30'
},
'fedora/rawhide/aarch64/atomic-host': {
'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/',
'key': 'fedora-30'
},
'fedora/rawhide/x86_64/silverblue': { 'fedora/rawhide/x86_64/silverblue': {
'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/',
'key': 'fedora-30' 'key': 'fedora-30'