F29 EOL Bodhi Changes
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu
Pierre-Yves Chibon
parent
2cbdbbfe1d
commit
b16bf22f2b
6 changed files with 3 additions and 84 deletions
|
|
@ -23,7 +23,7 @@ def handle(content):
|
|||
sys.stdout.flush()
|
||||
# XXX If you modify this taglist. Please also modify the other copy in
|
||||
# bodhi2/backend/tasks/main.yml
|
||||
taglist = 'f32 f32-container f32-modular f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular f29 f29-container f29-flatpak f29-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular'
|
||||
taglist = 'f32 f32-container f32-modular f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular'
|
||||
cmd = [
|
||||
'/usr/local/bin/owner-sync-pagure',
|
||||
'--package', package,
|
||||
|
|
|
|||
|
|
@ -106,54 +106,6 @@ RELEASES = {'f31': {'topic': 'fedora',
|
|||
'dest': os.path.join(FEDORAALTDEST, 'testing', '30', 'Modular')}
|
||||
]}}
|
||||
},
|
||||
'f29': {'topic': 'fedora',
|
||||
'version': '29',
|
||||
'modules': ['fedora', 'fedora-secondary'],
|
||||
'repos': {'updates': {
|
||||
'from': 'f29-updates',
|
||||
'ostrees': [{'ref': 'fedora/29/%(arch)s/updates/atomic-host',
|
||||
'dest': OSTREEDEST,
|
||||
'arches': ['x86_64', 'ppc64le', 'aarch64']},
|
||||
{'ref': 'fedora/29/x86_64/updates/silverblue',
|
||||
'dest': OSTREEDEST}],
|
||||
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
|
||||
'dest': os.path.join(FEDORADEST, '29', 'Everything')},
|
||||
{'arches': ['i386', 'ppc64le', 's390x'],
|
||||
'dest': os.path.join(FEDORAALTDEST, '29', 'Everything')}
|
||||
]},
|
||||
'updates-testing': {
|
||||
'from': 'f29-updates-testing',
|
||||
'ostrees': [{'ref': 'fedora/29/%(arch)s/testing/atomic-host',
|
||||
'dest': OSTREEDEST,
|
||||
'arches': ['x86_64', 'ppc64le', 'aarch64']},
|
||||
{'ref': 'fedora/29/x86_64/testing/silverblue',
|
||||
'dest': OSTREEDEST}],
|
||||
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
|
||||
'dest': os.path.join(FEDORADEST, 'testing', '29', 'Everything')},
|
||||
{'arches': ['i386', 'ppc64le', 's390x'],
|
||||
'dest': os.path.join(FEDORAALTDEST, 'testing', '29', 'Everything')}
|
||||
]}}
|
||||
},
|
||||
'f29m': {'topic': 'fedora',
|
||||
'version': '29m',
|
||||
'modules': ['fedora', 'fedora-secondary'],
|
||||
'repos': {'updates': {
|
||||
'from': 'f29-modular-updates',
|
||||
'ostrees': [],
|
||||
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
|
||||
'dest': os.path.join(FEDORADEST, '29', 'Modular')},
|
||||
{'arches': ['i386', 'ppc64le', 's390x'],
|
||||
'dest': os.path.join(FEDORAALTDEST, '29', 'Modular')}
|
||||
]},
|
||||
'updates-testing': {
|
||||
'from': 'f29-modular-updates-testing',
|
||||
'ostrees': [],
|
||||
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
|
||||
'dest': os.path.join(FEDORADEST, 'testing', '29', 'Modular')},
|
||||
{'arches': ['i386', 'ppc64le', 's390x'],
|
||||
'dest': os.path.join(FEDORAALTDEST, 'testing', '29', 'Modular')}
|
||||
]}}
|
||||
},
|
||||
'epel8': {'topic': 'epel',
|
||||
'version': '8',
|
||||
'modules': ['epel'],
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
# bodhi2/backend/files/koji-sync-listener.py
|
||||
# This cronjob runs only once a day. The listener script runs reactively.
|
||||
cron: name="owner-sync" minute="15" hour="4" user="root"
|
||||
job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f32 f32-container f32-modular f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular f29 f29-container f29-flatpak f29-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular'"
|
||||
job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f32 f32-container f32-modular f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular'"
|
||||
cron_file=update-koji-owner
|
||||
when: env == "production"
|
||||
tags:
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ variants_file='module-variants.xml'
|
|||
sigkeys = [
|
||||
[% if release.version_int == 28 %]
|
||||
'9db62fb1',
|
||||
[% elif release.version_int == 29 %]
|
||||
'429476b4',
|
||||
[% elif release.version_int == 30 %]
|
||||
'cfc659b9',
|
||||
[% elif release.version_int == 31 %]
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ sigkeys = [
|
|||
'f5282ee4',
|
||||
[% elif release.version_int == 28 %]
|
||||
'9db62fb1',
|
||||
[% elif release.version_int == 29 %]
|
||||
'429476b4',
|
||||
[% elif release.version_int == 30 %]
|
||||
'cfc659b9',
|
||||
[% elif release.version_int == 31 %]
|
||||
|
|
@ -138,35 +136,6 @@ createiso_skip = [
|
|||
[% if release.id_prefix == 'FEDORA' %]
|
||||
ostree = {
|
||||
"^Everything$": [
|
||||
# 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",
|
||||
"force_new_commit": True
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "f[[ release.version ]]",
|
||||
"repo": [
|
||||
"Everything",
|
||||
"https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/",
|
||||
[% 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 %]
|
||||
]
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/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,
|
||||
"arches": ["x86_64", "ppc64le", "aarch64" ],
|
||||
"failable": ["ppc64le", "aarch64"],
|
||||
},
|
||||
[% endif %]
|
||||
# Fedora Silverblue
|
||||
{
|
||||
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<variant id="Everything" name="Everything" type="variant">
|
||||
<arches>
|
||||
<arch>x86_64</arch>
|
||||
[% if release.version_int == 29 or release.version_int == 30 or release.version_int == 6 %]
|
||||
[% if release.version_int == 30 or release.version_int == 6 %]
|
||||
<arch>i386</arch>
|
||||
[% endif %]
|
||||
[% if release.id_prefix == "FEDORA" %]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue