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

Bodhi changes for f30 branching from rawhide

Browse source 
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
This commit is contained in:
Mohan Boddu 2019-02-19 21:46:50 +00:00
parent 34c9e6bd4a
commit fe0d69fc85
3 changed files with 51 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/bodhi2/backend/files/koji-sync-listener.py
View file

@ -23,7 +23,7 @@ def handle(content):
sys.stdout.flush() sys.stdout.flush()
# XXX If you modify this taglist. Please also modify the other copy in # XXX If you modify this taglist. Please also modify the other copy in
# bodhi2/backend/tasks/main.yml # bodhi2/backend/tasks/main.yml
taglist = 'f30 f30-container f30-modular f29 f28 f29-container f28-container f28-docker f29-modular f28-modular epel7 dist-6E-epel module-package-list modular' taglist = 'f31 f31-container f31-modular f30 f30-container f30-modular f29 f28 f29-container f28-container f28-docker f29-modular f28-modular epel7 dist-6E-epel module-package-list modular'
cmd = [ cmd = [
'/usr/local/bin/owner-sync-pagure', '/usr/local/bin/owner-sync-pagure',
'--package', package, '--package', package,

50
roles/bodhi2/backend/files/new-updates-sync
View file

@ -20,7 +20,55 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/'
EPELDEST = '/pub/epel/' EPELDEST = '/pub/epel/'
OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/'
OSTREEDEST = '/mnt/koji/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/'
RELEASES = {'f29': {'topic': 'fedora', RELEASES = {'f30': {'topic': 'fedora',
'version': '30',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {
'from': 'f30-updates',
'ostrees': [{'ref': 'fedora/30/%(arch)s/updates/atomic-host',
'dest': OSTREEDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/30/x86_64/updates/silverblue',
'dest': OSTREEDEST}],
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
'dest': os.path.join(FEDORADEST, '30', 'Everything')},
{'arches': ['i386', 'ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, '30', 'Everything')}
]},
'updates-testing': {
'from': 'f30-updates-testing',
'ostrees': [{'ref': 'fedora/30/%(arch)s/testing/atomic-host',
'dest': OSTREEDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']},
{'ref': 'fedora/30/x86_64/testing/silverblue',
'dest': OSTREEDEST}],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '30', 'Everything')},
{'arches': ['i386', 'ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, 'testing', '30', 'Everything')}
]}}
},
'f30m': {'topic': 'fedora',
'version': '30m',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {
'from': 'f30-modular-updates',
'ostrees': [],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, '30', 'Modular')},
{'arches': ['i386', 'ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, '30', 'Modular')}
]},
'updates-testing': {
'from': 'f30-modular-updates-testing',
'ostrees': [],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '30', 'Modular')},
{'arches': ['i386', 'ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, 'testing', '30', 'Modular')}
]}}
},
'f29': {'topic': 'fedora',
'version': '29', 'version': '29',
'modules': ['fedora', 'fedora-secondary'], 'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': { 'repos': {'updates': {

2
roles/bodhi2/backend/tasks/main.yml
View file

@ -166,7 +166,7 @@
# bodhi2/backend/files/koji-sync-listener.py # bodhi2/backend/files/koji-sync-listener.py
# This cronjob runs only once a day. The listener script runs reactively. # This cronjob runs only once a day. The listener script runs reactively.
cron: name="owner-sync" minute="15" hour="4" user="root" cron: name="owner-sync" minute="15" hour="4" user="root"
job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f30 f30-container f30-modular f29 f28 f29-container f28-container f28-docker f29-modular f28-modular epel7 dist-6E-epel module-package-list modular'" job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f31 f31-container f31-modular f30 f30-container f30-modular f29 f28 f29-container f28-container f28-docker f29-modular f28-modular epel7 dist-6E-epel module-package-list modular'"
cron_file=update-koji-owner cron_file=update-koji-owner
when: inventory_hostname.startswith('bodhi-backend01') and env == "production" when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
tags: tags: