diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index f7cdcf7ca4..da37bb63a8 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -116,48 +116,6 @@ RELEASES = {'f42': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '41', 'Everything')} ]}} }, - 'f40': {'topic': 'fedora', - 'version': '40', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f40-updates', - 'ostrees': [{'ref': 'fedora/40/%(arch)s/updates/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/40/%(arch)s/updates/kinoite', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/40/%(arch)s/updates/sericea', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/40/%(arch)s/updates/onyx', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '40', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '40', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f40-updates-testing', - 'ostrees': [{'ref': 'fedora/40/%(arch)s/testing/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/40/%(arch)s/testing/kinoite', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/40/%(arch)s/testing/sericea', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}, - {'ref': 'fedora/40/%(arch)s/testing/onyx', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '40', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '40', 'Everything')} - ]}} - }, 'epel10.1': {'topic': 'epel', 'version': '10.1', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index b979fd4b5f..68b9798674 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -116,7 +116,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 f43 f42 f41 f40 epel10.1 epel10.0 epel9 epel9-next epel8'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f43 f42 f41 epel10.1 epel10.0 epel9 epel9-next epel8'" cron_file=update-koji-owner user=apache when: env == "production" diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 7937965a07..8f9fff2e1f 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -45,12 +45,6 @@ taglist = [ "f41", "f41-container", "f41-flatpak", - "f40", - "f40-container", - "f40-flatpak", - "f39", - "f39-container", - "f39-flatpak", "epel10.1", "epel10.0", "epel9", diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 45e4941baa..44ac1edf45 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -229,8 +229,6 @@ sidetag = tag f43-build :: allow tag f42-build :: allow tag f41-build :: allow - tag f40-build :: allow - tag f39-build :: allow tag eln-build :: allow tag epel10.1-build :: allow tag epel10.0-build :: allow diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index a7cd6d4933..3ca1cad3ca 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -37,11 +37,11 @@ "allow_retire": true, "branchname": "master", "date_created": "2014-05-14 12:36:15", - "date_updated": "2023-08-08 17:07:23", + "date_updated": "2025-05-13 14:50:23", "dist_tag": ".fc40", "koji_name": "f40", "name": "Fedora Linux", - "status": "Active", + "status": "EOL", "version": "40" }, { diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 4076884378..a002d3b9e4 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -112,13 +112,6 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - [[consumer_config.koji_instances.primary.tags]] - from = "f40-infra-candidate" - to = "f40-infra-stg" - key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" - file_signing_key = "fedora-40-ima" - [[consumer_config.koji_instances.primary.tags]] from = "f41-infra-candidate" to = "f41-infra-stg" @@ -141,14 +134,7 @@ handlers = ["console"] file_signing_key = "fedora-43-ima" # Gated coreos-pool tag - - [[consumer_config.koji_instances.primary.tags]] - from = "f40-coreos-signing-pending" - to = "coreos-pool" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}" - file_signing_key = "fedora-40-ima" - + [[consumer_config.koji_instances.primary.tags]] from = "f41-coreos-signing-pending" to = "coreos-pool" @@ -232,27 +218,6 @@ handlers = ["console"] trusted_taggers = ['bodhi'] file_signing_key = "fedora-41-ima" - [[consumer_config.koji_instances.primary.tags]] - from = "f40-signing-pending" - to = "f40-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}" - file_signing_key = "fedora-40-ima" - - [consumer_config.koji_instances.primary.tags.sidetags] - pattern = 'f40-build-side-' - from = '-signing-pending' - to = '-testing-pending' - trusted_taggers = ['bodhi'] - file_signing_key = "fedora-40-ima" - - [[consumer_config.koji_instances.primary.tags]] - from = "f40-pending" - to = "f40" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}" - file_signing_key = "fedora-40-ima" - # Gated bodhi updates [[consumer_config.koji_instances.primary.tags]] @@ -380,13 +345,6 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}" file_signing_key = "fedora-41-ima" - [[consumer_config.koji_instances.primary.tags]] - from = "f40-openh264" - to = "f40-openh264" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}" - file_signing_key = "fedora-40-ima" - [[consumer_config.koji_instances.primary.tags]] from = "epel9-openh264" to = "epel9-openh264" @@ -443,44 +401,6 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" - # f40 silveblue ostree refs - - [consumer_config.ostree_refs."fedora/40/x86_64/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/updates/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/testing/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/updates/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/testing/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/updates/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/testing/silverblue"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - # f41 silveblue ostree refs [consumer_config.ostree_refs."fedora/41/x86_64/silverblue"] @@ -571,44 +491,6 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" - # f40 kinoite ostree refs - - [consumer_config.ostree_refs."fedora/40/x86_64/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/updates/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/testing/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/updates/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/testing/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/updates/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/testing/kinoite"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - # f41 kinoite ostree refs [consumer_config.ostree_refs."fedora/41/x86_64/kinoite"] @@ -699,44 +581,6 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" - # f40 sericea ostree refs - - [consumer_config.ostree_refs."fedora/40/x86_64/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/updates/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/testing/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/updates/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/testing/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/updates/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/testing/sericea"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - # f41 sericea ostree refs [consumer_config.ostree_refs."fedora/41/x86_64/sericea"] @@ -827,43 +671,6 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" - # f40 onyx ostree refs - - [consumer_config.ostree_refs."fedora/40/x86_64/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/updates/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/x86_64/testing/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/updates/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/aarch64/testing/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/updates/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" - - [consumer_config.ostree_refs."fedora/40/ppc64le/testing/onyx"] - directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}" # f41 onyx ostree refs diff --git a/vars/all/FedoraPreviousPrevious.yaml b/vars/all/FedoraPreviousPrevious.yaml index af1e22a3b2..519608fa95 100644 --- a/vars/all/FedoraPreviousPrevious.yaml +++ b/vars/all/FedoraPreviousPrevious.yaml @@ -1,2 +1,2 @@ --- -FedoraPreviousPrevious: True +FedoraPreviousPrevious: False