diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index d8c8a73492..8bf0deb36f 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -155,21 +155,6 @@ RELEASES = {'f33': {'topic': 'fedora', 'dest': os.path.join(EPELDEST, '7')} ]}} }, - 'epel6': {'topic': 'epel', - 'version': '6', - 'modules': ['epel'], - 'repos': {'epel': { - 'from': 'dist-6E-epel', - 'to': [{'arches': ['x86_64', 'i386', 'source'], - 'dest': os.path.join(EPELDEST, '6')} - ]}, - 'epel-testing': { - 'from': 'dist-6E-epel-testing', - 'to': [{'arches': ['x86_64', 'i386', 'source'], - 'dest': os.path.join(EPELDEST, 'testing', '6')} - ]}, - } - }, } diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index d84f86ae8f..dac5f17385 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -76,7 +76,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 f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak epel8 epel8-playground epel8-modular epel7 module-package-list modular'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 41954ca6d0..3008104950 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -52,7 +52,6 @@ taglist = [ "epel8-playground", "epel8-modular", "epel7", - "dist-6E-epel", "module-package-list", "modular", ] diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 0eae499d2b..59eed8576f 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -415,7 +415,7 @@ "dist_tag": ".el6", "koji_name": "dist-6E-epel", "name": "Fedora EPEL", - "status": "Active", + "status": "EOL", "version": "6" }, { diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 60295c1ca7..06d86bcb0a 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -94,12 +94,6 @@ handlers = ["console"] # Infra tags - [[consumer_config.koji_instances.primary.tags]] - from = "epel6-infra-candidate" - to = "epel6-infra-stg" - key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] from = "epel7-infra-candidate" to = "epel7-infra-stg" @@ -303,14 +297,6 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('epel-7', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('352c64e5', 'd300e724') }}" - # Non-gated bodhi triggered - - [[consumer_config.koji_instances.primary.tags]] - from = "dist-6E-epel-testing-candidate" - to = "dist-6E-epel-testing-candidate" - key = "{{ (env == 'production')|ternary('epel-6', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('0608b895', 'd300e724') }}" - # ELN signing [[consumer_config.koji_instances.primary.tags]]