From b21f8e7f630325e35ae67c55a1375f44ee94fd5c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 21 Aug 2017 18:52:43 +0000 Subject: [PATCH] Support those old crummy docker tags too. --- roles/bodhi2/backend/files/koji-sync-fedwatch-glue.py | 2 +- roles/bodhi2/backend/tasks/main.yml | 2 +- roles/bodhi2/backend/templates/owner-sync-pagure.j2 | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/bodhi2/backend/files/koji-sync-fedwatch-glue.py b/roles/bodhi2/backend/files/koji-sync-fedwatch-glue.py index 8fcc44255d..7e11f00d52 100644 --- a/roles/bodhi2/backend/files/koji-sync-fedwatch-glue.py +++ b/roles/bodhi2/backend/files/koji-sync-fedwatch-glue.py @@ -17,7 +17,7 @@ def handle(content): package = body['repo'] # XXX If you modify this taglist. Please also modify the other copy in # 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 = [ '/usr/local/bin/owner-sync-pagure', '--package', package, diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index e2c036cfbd..0706b6b684 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -167,7 +167,7 @@ # bodhi2/backend/files/koji-sync-fedwatch-glue.py # This cronjob runs only once a day. The fedwatch 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 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 when: inventory_hostname.startswith('bodhi-backend01') and env == "production" tags: diff --git a/roles/bodhi2/backend/templates/owner-sync-pagure.j2 b/roles/bodhi2/backend/templates/owner-sync-pagure.j2 index 7bfbd6d24e..ee88af3b7d 100755 --- a/roles/bodhi2/backend/templates/owner-sync-pagure.j2 +++ b/roles/bodhi2/backend/templates/owner-sync-pagure.j2 @@ -122,6 +122,9 @@ def get_namespace_and_version_from_tag(tag): if 'container' in tag: namespace = 'container' 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': # See https://pagure.io/releng/issue/6663 # and https://pagure.io/fm-orchestrator/issue/333