From 894654efca6823af12491afb855a31b094054bc2 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 12 Dec 2017 16:20:56 +0000 Subject: [PATCH] F25 is now EOL Also removing 24 mash files as it is also a EOL release Signed-off-by: Mohan Boddu --- .../backend/files/f24-updates-testing.mash | 22 ------------------- roles/bodhi2/backend/files/f24-updates.mash | 20 ----------------- .../backend/files/f25-updates-testing.mash | 22 ------------------- roles/bodhi2/backend/files/f25-updates.mash | 20 ----------------- roles/bodhi2/backend/files/new-updates-sync | 14 ------------ roles/bodhi2/backend/tasks/main.yml | 4 +--- 6 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 roles/bodhi2/backend/files/f24-updates-testing.mash delete mode 100644 roles/bodhi2/backend/files/f24-updates.mash delete mode 100644 roles/bodhi2/backend/files/f25-updates-testing.mash delete mode 100644 roles/bodhi2/backend/files/f25-updates.mash diff --git a/roles/bodhi2/backend/files/f24-updates-testing.mash b/roles/bodhi2/backend/files/f24-updates-testing.mash deleted file mode 100644 index 43ae616c81..0000000000 --- a/roles/bodhi2/backend/files/f24-updates-testing.mash +++ /dev/null @@ -1,22 +0,0 @@ -# mash config file - -[f24-updates-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f24-updates-testing -inherit = False -strict_keys = True -keys = 81B46521 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/24/%(arch)s/ -repoviewtitle = "Fedora 24 Updates Testing - %(arch)s" -arches = armhfp i386 x86_64 -hash_packages = True -delta = True -delta_dirs = /pub/fedora/linux/releases/24/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f24-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/24/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/24/Everything/%(arch)s/os -# point to branched till we release then use above -#delta_dirs = /pub/fedora/linux/development/24/Everything/%(arch)s/os/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/24/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f24-updates.mash b/roles/bodhi2/backend/files/f24-updates.mash deleted file mode 100644 index 71d7ac2cc7..0000000000 --- a/roles/bodhi2/backend/files/f24-updates.mash +++ /dev/null @@ -1,20 +0,0 @@ -[f24-updates] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f24-updates -inherit = False -strict_keys = True -keys = 81B46521 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/24/%(arch)s/ -repoviewtitle = "Fedora 24 Updates - %(arch)s" -arches = armhfp i386 x86_64 -hash_packages = True -delta = True -delta_dirs = /pub/fedora/linux/releases/24/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f24-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/24/Everything/%(arch)s/os -# point to branched till we release then use above -#delta_dirs = /pub/fedora/linux/development/24/Everything/%(arch)s/os/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/24/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f25-updates-testing.mash b/roles/bodhi2/backend/files/f25-updates-testing.mash deleted file mode 100644 index d0d11c4825..0000000000 --- a/roles/bodhi2/backend/files/f25-updates-testing.mash +++ /dev/null @@ -1,22 +0,0 @@ -# mash config file - -[f25-updates-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f25-updates-testing -inherit = False -strict_keys = True -keys = fdb19c98 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/25/%(arch)s/ -repoviewtitle = "Fedora 25 Updates Testing - %(arch)s" -arches = armhfp i386 x86_64 -hash_packages = True -delta = True -delta_dirs = /pub/fedora/linux/releases/25/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f25-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/25/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/25/Everything/%(arch)s/os -# point to branched till we release then use above -#delta_dirs = /pub/fedora/linux/development/25/Everything/%(arch)s/os/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/25/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f25-updates.mash b/roles/bodhi2/backend/files/f25-updates.mash deleted file mode 100644 index 7ee7b3ea9b..0000000000 --- a/roles/bodhi2/backend/files/f25-updates.mash +++ /dev/null @@ -1,20 +0,0 @@ -[f25-updates] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f25-updates -inherit = False -strict_keys = True -keys = fdb19c98 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/25/%(arch)s/ -repoviewtitle = "Fedora 25 Updates - %(arch)s" -arches = armhfp i386 x86_64 -hash_packages = True -delta = True -delta_dirs = /pub/fedora/linux/releases/25/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f25-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/25/Everything/%(arch)s/os -# point to branched till we release then use above -#delta_dirs = /pub/fedora/linux/development/25/Everything/%(arch)s/os/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/25/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index c8a64dce9c..142a735166 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -50,20 +50,6 @@ RELEASES = {'f27': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '27')} ]}} }, - 'f25': {'topic': 'fedora', - 'version': '25', - 'modules': ['fedora'], - 'repos': {'updates': { - 'from': 'f25-updates', - 'to': [{'arches': ['x86_64', 'armhfp', 'i386', 'source'], - 'dest': os.path.join(FEDORADEST, '25')}, - ]}, - 'updates-testing': { - 'from': 'f25-updates-testing', - 'to': [{'arches': ['x86_64', 'armhfp', 'i386', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '25')}, - ]}} - }, 'f26': {'topic': 'fedora', 'version': '26', 'modules': ['fedora', 'fedora-secondary'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index afe8c5ba5e..d7afa9bbfc 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -133,8 +133,6 @@ owner=apache mode=0640 with_items: - - f25-updates.mash - - f25-updates-testing.mash - f26-updates.mash - f26-updates-testing.mash - f27-updates.mash @@ -197,7 +195,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 f28 f27 f26 f25 f28-container f27-container f26-container f25-container f28-docker f27-docker f26-docker f25-docker f27-modular epel7 dist-6E-epel module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f28 f27 f26 f28-container f27-container f26-container f28-docker f27-docker f26-docker f27-modular epel7 dist-6E-epel module-package-list modular'" cron_file=update-koji-owner when: inventory_hostname.startswith('bodhi-backend01') and env == "production" tags: