From fe0d69fc85cdadbf2f3b28c9d9fb61d469f6857e Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@redhat.com>
Date: Tue, 19 Feb 2019 21:46:50 +0000
Subject: [PATCH] Bodhi changes for f30 branching from rawhide

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
---
 .../backend/files/koji-sync-listener.py       |  2 +-
 roles/bodhi2/backend/files/new-updates-sync   | 50 ++++++++++++++++++-
 roles/bodhi2/backend/tasks/main.yml           |  2 +-
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/roles/bodhi2/backend/files/koji-sync-listener.py b/roles/bodhi2/backend/files/koji-sync-listener.py
index 02b0e3f18b..0e2efef872 100644
--- a/roles/bodhi2/backend/files/koji-sync-listener.py
+++ b/roles/bodhi2/backend/files/koji-sync-listener.py
@@ -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 = '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 = [
         '/usr/local/bin/owner-sync-pagure',
         '--package', package,
diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync
index 14c97d5835..1d364dc02b 100755
--- a/roles/bodhi2/backend/files/new-updates-sync
+++ b/roles/bodhi2/backend/files/new-updates-sync
@@ -20,7 +20,55 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/'
 EPELDEST = '/pub/epel/'
 OSTREESOURCE = '/mnt/koji/compose/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',
                     'modules': ['fedora', 'fedora-secondary'],
                     'repos': {'updates': {
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 114c113d54..b03119355b 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -166,7 +166,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 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
   when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
   tags: