diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 15061fa1b3..d0b622ee90 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -122,6 +122,48 @@ RELEASES = {'f43': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '42', 'Everything')} ]}} }, + 'f41': {'topic': 'fedora', + 'version': '41', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f41-updates', + 'ostrees': [{'ref': 'fedora/41/%(arch)s/updates/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/41/%(arch)s/updates/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/41/%(arch)s/updates/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/41/%(arch)s/updates/onyx', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '41', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '41', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f41-updates-testing', + 'ostrees': [{'ref': 'fedora/41/%(arch)s/testing/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/41/%(arch)s/testing/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/41/%(arch)s/testing/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/41/%(arch)s/testing/onyx', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '41', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '41', 'Everything')} + ]}} + }, 'epel10.2': {'topic': 'epel', 'version': '10.2', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index b104e08250..e0b0530912 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 f44 f43 f42 {{ epel_tags | join(' ') }} epel9 epel9-next epel8'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f44 f43 f42 f41 {{ epel_tags | join(' ') }} 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 73ba933ed7..f308593e1e 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -44,6 +44,9 @@ taglist = [ "f42", "f42-container", "f42-flatpak", + "f41", + "f41-container", + "f41-flatpak", {% for tag in epel_tags %} "{{ tag }}", {% endfor %} diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 15b519a9f8..6b180ce39b 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -244,6 +244,7 @@ sidetag = tag f44-build :: allow tag f43-build :: allow tag f42-build :: allow + tag f41-build :: allow tag eln-build :: allow {% for tag in epel_tags %} tag {{ tag }}-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 3ae970a5b5..c442f74071 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": "2024-11-26 14:30:23", + "date_updated": "2024-02-13 13:07:23", "dist_tag": ".fc41", "koji_name": "f41", "name": "Fedora Linux", - "status": "EOL", + "status": "Active", "version": "41" }, { diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 77386aa360..aa79431094 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -112,6 +112,13 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" + [[consumer_config.koji_instances.primary.tags]] + from = "f41-infra-candidate" + to = "f41-infra-stg" + key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" + file_signing_key = "fedora-41-ima" + [[consumer_config.koji_instances.primary.tags]] from = "f42-infra-candidate" to = "f42-infra-stg" @@ -135,6 +142,13 @@ handlers = ["console"] # Gated coreos-pool tag + [[consumer_config.koji_instances.primary.tags]] + from = "f41-coreos-signing-pending" + to = "coreos-pool" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}" + file_signing_key = "fedora-41-ima" + [[consumer_config.koji_instances.primary.tags]] from = "f42-coreos-signing-pending" to = "coreos-pool" @@ -218,6 +232,20 @@ handlers = ["console"] trusted_taggers = ['bodhi'] file_signing_key = "fedora-42-ima" + [[consumer_config.koji_instances.primary.tags]] + from = "f41-signing-pending" + to = "f41-updates-testing-pending" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}" + file_signing_key = "fedora-41-ima" + + [consumer_config.koji_instances.primary.tags.sidetags] + pattern = 'f41-build-side-' + from = '-signing-pending' + to = '-testing-pending' + trusted_taggers = ['bodhi'] + file_signing_key = "fedora-41-ima" + # Gated bodhi updates {% for tag in epel_tags %} @@ -335,6 +363,13 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('105ef944', 'd300e724') }}" file_signing_key = "fedora-42-ima" + [[consumer_config.koji_instances.primary.tags]] + from = "f41-openh264" + to = "f41-openh264" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}" + file_signing_key = "fedora-41-ima" + [[consumer_config.koji_instances.primary.tags]] from = "epel9-openh264" to = "epel9-openh264" @@ -350,6 +385,14 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('31645531', 'd300e724') }}" file_signing_key = "fedora-43-ima" + # F41 Python Side tag (f41-python) + [[consumer_config.koji_instances.primary.tags]] + from = "f41-python" + to = "f41-python" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}" + file_signing_key = "fedora-41-ima" + # F43 Perl Side tag (f43-perl) [[consumer_config.koji_instances.primary.tags]] from = "f43-perl" @@ -391,6 +434,44 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + # f41 silveblue ostree refs + + [consumer_config.ostree_refs."fedora/41/x86_64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + # f42 silveblue ostree refs [consumer_config.ostree_refs."fedora/42/x86_64/silverblue"] @@ -481,6 +562,44 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # f41 kinoite ostree refs + + [consumer_config.ostree_refs."fedora/41/x86_64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + # f42 kinoite ostree refs [consumer_config.ostree_refs."fedora/42/x86_64/kinoite"] @@ -571,6 +690,44 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # f41 sericea ostree refs + + [consumer_config.ostree_refs."fedora/41/x86_64/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + # f42 sericea ostree refs [consumer_config.ostree_refs."fedora/42/x86_64/sericea"] @@ -661,6 +818,45 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + # f41 onyx ostree refs + + [consumer_config.ostree_refs."fedora/41/x86_64/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/x86_64/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/aarch64/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/41/ppc64le/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + # f42 onyx ostree refs [consumer_config.ostree_refs."fedora/42/x86_64/onyx"] diff --git a/vars/all/FedoraPreviousPrevious.yaml b/vars/all/FedoraPreviousPrevious.yaml index 519608fa95..af1e22a3b2 100644 --- a/vars/all/FedoraPreviousPrevious.yaml +++ b/vars/all/FedoraPreviousPrevious.yaml @@ -1,2 +1,2 @@ --- -FedoraPreviousPrevious: False +FedoraPreviousPrevious: True