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

Support those old crummy docker tags too.

Browse source
This commit is contained in:
Ralph Bean 2017-08-21 18:52:43 +00:00
parent 0e9fc2e6ed
commit b21f8e7f63
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ def handle(content):
package = body['repo'] package = body['repo']
# 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 = 'f28 f27 f26 f25 f28-container f27-container f26-container f25-container epel7 dist-6E-epel module-package-list' taglist = 'f28 f27 f26 f25 f28-container f27-container f26-container f25-container f28-docker f27-docker f26-docker f25-docker epel7 dist-6E-epel module-package-list'
cmd = [ cmd = [
'/usr/local/bin/owner-sync-pagure', '/usr/local/bin/owner-sync-pagure',
'--package', package, '--package', package,

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

@ -167,7 +167,7 @@
# bodhi2/backend/files/koji-sync-fedwatch-glue.py # bodhi2/backend/files/koji-sync-fedwatch-glue.py
# This cronjob runs only once a day. The fedwatch script runs reactively. # This cronjob runs only once a day. The fedwatch 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 f28 f27 f26 f25 f28-container f27-container f26-container f25-container epel7 dist-6E-epel module-package-list'" job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f28 f27 f26 f25 f28-container f27-container f26-container f25-container f28-docker f27-docker f26-docker f25-docker epel7 dist-6E-epel module-package-list'"
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:

3
roles/bodhi2/backend/templates/owner-sync-pagure.j2
View file

@ -122,6 +122,9 @@ def get_namespace_and_version_from_tag(tag):
if 'container' in tag: if 'container' in tag:
namespace = 'container' namespace = 'container'
version = tag.split('-')[0].split('f')[1] version = tag.split('-')[0].split('f')[1]
elif 'docker' in tag:
namespace = 'container'
version = tag.split('-')[0].split('f')[1]
elif tag == 'module-package-list': elif tag == 'module-package-list':
# See https://pagure.io/releng/issue/6663 # See https://pagure.io/releng/issue/6663
# and https://pagure.io/fm-orchestrator/issue/333 # and https://pagure.io/fm-orchestrator/issue/333