From 775245a82362fa25ae2b63864c7552d2cb904b40 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 28 May 2019 14:15:06 +0000 Subject: [PATCH] Fedora 28 EOL - Bodhi Changes Signed-off-by: Mohan Boddu --- .../backend/files/koji-sync-listener.py | 2 +- roles/bodhi2/backend/files/new-updates-sync | 51 ------------------- roles/bodhi2/backend/tasks/main.yml | 2 +- .../backend/templates/tag2distrepo.py.j2 | 2 - 4 files changed, 2 insertions(+), 55 deletions(-) diff --git a/roles/bodhi2/backend/files/koji-sync-listener.py b/roles/bodhi2/backend/files/koji-sync-listener.py index 9f94cbd1cb..5d65cc164e 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 = 'f31 f31-container f31-modular f30 f30-container f30-modular f29 f28 f29-container f29-flatpak 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 f29-container f29-flatpak f29-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 7d6e4569b9..b8daf76575 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -110,57 +110,6 @@ RELEASES = {'f30': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '29', 'Modular')} ]}} }, - 'f28': {'topic': 'fedora', - 'version': '28', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f28-updates', - 'ostrees': [{'ref': 'fedora/28/%(arch)s/updates/atomic-host', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/28/x86_64/updates/workstation', - 'dest': OSTREEDEST}, - # Hack around for the fact that ostree on f25 doesn't know links - {'ref': 'fedora/28/x86_64/workstation', - 'dest': OSTREEDEST}], - 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '28', 'Everything')}, - {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '28', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f28-updates-testing', - 'ostrees': [{'ref': 'fedora/28/%(arch)s/testing/atomic-host', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/28/x86_64/testing/workstation', - 'dest': OSTREEDEST}], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '28', 'Everything')}, - {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '28', 'Everything')} - ]}} - }, - 'f28m': {'topic': 'fedora', - 'version': '28m', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f28-modular-updates', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, '28', 'Modular')}, - {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '28', 'Modular')} - ]}, - 'updates-testing': { - 'from': 'f28-modular-updates-testing', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '28', 'Modular')}, - {'arches': ['i386', 'ppc64', 'ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '28', 'Modular')} - ]}} - }, 'epel7': {'topic': 'epel', 'version': '7', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 9fa2040c77..a3ac7b4c7d 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -168,7 +168,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 f31 f31-container f31-modular f30 f30-container f30-modular f29 f28 f29-container f29-flatpak 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 f29-container f29-flatpak f29-modular epel7 dist-6E-epel module-package-list modular'" cron_file=update-koji-owner when: inventory_hostname.startswith('bodhi-backend01') and env == "production" tags: diff --git a/roles/bodhi2/backend/templates/tag2distrepo.py.j2 b/roles/bodhi2/backend/templates/tag2distrepo.py.j2 index e5af374dad..8617082c74 100644 --- a/roles/bodhi2/backend/templates/tag2distrepo.py.j2 +++ b/roles/bodhi2/backend/templates/tag2distrepo.py.j2 @@ -16,8 +16,6 @@ config = { }, 'tags': { - 'f28-infra': ['47dd8ef9'], - 'f28-infra-stg': ['47dd8ef9'], 'f29-infra': ['47dd8ef9'], 'f29-infra-stg': ['47dd8ef9'], 'f30-infra': ['47dd8ef9'],