From 46fbcc5567f550b695ec5ca002952c2ed6556347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Polakovi=C4=8D?= Date: Fri, 30 Jan 2026 15:42:24 +0100 Subject: [PATCH] Branch Fedora 44 from Rawhide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrik Polakovič --- roles/bodhi2/backend/files/new-updates-sync | 52 ++- roles/bodhi2/backend/tasks/main.yml | 2 +- .../backend/templates/koji_sync_listener.toml | 2 + .../backend/templates/pungi.rpm.conf.j2 | 2 + roles/koji_hub/templates/hub.conf.j2 | 1 + .../poddlers/templates/fedora-messaging.toml | 4 + .../pkgdb-gnome-software-collections.json | 15 +- .../templates/robosignatory.toml.j2 | 309 +++++++++++++++--- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- 10 files changed, 336 insertions(+), 55 deletions(-) diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 15061fa1b3..893c949e86 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -26,7 +26,55 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/' -RELEASES = {'f43': {'topic': 'fedora', +RELEASES = {'f44': {'topic': 'fedora', + 'version': '44', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f44-updates', + 'ostrees': [{'ref': 'fedora/44/%(arch)s/updates/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/updates/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/updates/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/updates/onyx', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/updates/cosmic-atomic', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '44', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '44', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f44-updates-testing', + 'ostrees': [{'ref': 'fedora/44/%(arch)s/testing/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/testing/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/testing/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/testing/onyx', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}, + {'ref': 'fedora/44/%(arch)s/testing/cosmic-atomic', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '44', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '44', 'Everything')} + ]}} + }, + 'f43': {'topic': 'fedora', 'version': '43', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { @@ -73,7 +121,7 @@ RELEASES = {'f43': {'topic': 'fedora', {'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST, 'testing', '43', 'Everything')} ]}} - }, + }, 'f42': {'topic': 'fedora', 'version': '42', 'modules': ['fedora', 'fedora-secondary'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index b104e08250..de03b5c1e9 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 f45 f44 f43 f42 {{ 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..7e124c9cd2 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -36,6 +36,8 @@ arguments = {} # XXX If you modify this taglist. Please also modify the other copy in # bodhi2/backend/tasks/main.yml taglist = [ + "f45", + "f45-flatpak", "f44", "f44-flatpak", "f43", diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 14b6b91ef5..f0958ded74 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -49,6 +49,8 @@ sigkeys = [ '31645531', [% elif release.version == '44' %] '6d9f90a6', +[% elif release.version == '45' %] + 'f577861e', [% elif release.version == '6' %] '0608b895', [% elif release.version == '7' %] diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 0b5b365139..032c80c28f 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -242,6 +242,7 @@ package_list = all :: deny sidetag = + tag f45-build :: allow tag f44-build :: allow tag f43-build :: allow tag f42-build :: allow diff --git a/roles/openshift-apps/poddlers/templates/fedora-messaging.toml b/roles/openshift-apps/poddlers/templates/fedora-messaging.toml index b50cdad2e7..3a8ffed0e7 100644 --- a/roles/openshift-apps/poddlers/templates/fedora-messaging.toml +++ b/roles/openshift-apps/poddlers/templates/fedora-messaging.toml @@ -351,6 +351,10 @@ stable_api = '2024-05-31' security_fixes = '2024-05-31' bug_fixes = '2024-05-31' +[consumer_config.scm_request_processor.branch_slas.f44] +bug_fixes = '2027-05-19' +security_fixes = '2027-05-19' + [consumer_config.scm_request_processor.branch_slas.f43] bug_fixes = '2026-12-02' security_fixes = '2026-12-02' diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 6bb7a57655..d9d63fcdcc 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -4,13 +4,24 @@ "allow_retire": true, "branchname": "master", "date_created": "2014-05-14 12:36:15", - "date_updated": "2025-08-12 14:30:00", - "dist_tag": ".fc44", + "date_updated": "2026-02-03 14:30:00", + "dist_tag": ".fc45", "koji_name": "rawhide", "name": "Fedora Linux", "status": "Under Development", "version": "devel" }, + { + "allow_retire": true, + "branchname": "f44", + "date_created": "2026-02-03 14:30:00", + "date_updated": "2026-02-03 14:30:00", + "dist_tag": ".fc44", + "koji_name": "f44", + "name": "Fedora Linux", + "status": "Under Development", + "version": "44" + }, { "allow_retire": true, "branchname": "f43", diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 6358a3c21c..154c879d69 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -133,6 +133,13 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" file_signing_key = "fedora-44-ima" + [[consumer_config.koji_instances.primary.tags]] + from = "f45-infra-candidate" + to = "f45-infra-stg" + key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" + file_signing_key = "fedora-45-ima" + # Gated coreos-pool tag [[consumer_config.koji_instances.primary.tags]] @@ -156,8 +163,45 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('6d9f90a6', 'd300e724') }}" file_signing_key = "fedora-44-ima" + [[consumer_config.koji_instances.primary.tags]] + from = "f45-coreos-signing-pending" + to = "coreos-pool" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" + # Gated rawhide + [[consumer_config.koji_instances.primary.tags]] + from = "f45-signing-pending" + to = "f45-updates-testing-pending" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" + + [consumer_config.koji_instances.primary.tags.sidetags] + pattern = 'f45-build-side-' + from = '-signing-pending' + to = '-testing-pending' + trusted_taggers = ['bodhi'] + file_signing_key = "fedora-45-ima" + + [[consumer_config.koji_instances.primary.tags]] + from = "f45-pending" + to = "f45" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" + + [[consumer_config.koji_instances.primary.tags]] + from = "f45" + to = "f45" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" + + # Branched + [[consumer_config.koji_instances.primary.tags]] from = "f44-signing-pending" to = "f44-updates-testing-pending" @@ -172,21 +216,7 @@ handlers = ["console"] trusted_taggers = ['bodhi'] file_signing_key = "fedora-44-ima" - [[consumer_config.koji_instances.primary.tags]] - from = "f44-pending" - to = "f44" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('6d9f90a6', 'd300e724') }}" - file_signing_key = "fedora-44-ima" - - [[consumer_config.koji_instances.primary.tags]] - from = "f44" - to = "f44" - key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" - file_signing_key = "fedora-45-ima" - - # Branched + # stable releases [[consumer_config.koji_instances.primary.tags]] from = "f43-signing-pending" @@ -202,8 +232,6 @@ handlers = ["console"] trusted_taggers = ['bodhi'] file_signing_key = "fedora-43-ima" - # stable releases - [[consumer_config.koji_instances.primary.tags]] from = "f42-signing-pending" to = "f42-updates-testing-pending" @@ -275,33 +303,33 @@ handlers = ["console"] [[consumer_config.koji_instances.primary.tags]] from = "eln-signing-pending" to = "eln-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('6d9f90a6', 'd300e724') }}" - file_signing_key = "fedora-44-ima" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" [[consumer_config.koji_instances.primary.tags]] from = "eln-modular-updates-candidate" to = "eln-modular" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('6d9f90a6', 'd300e724') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" type = "modular" - file_signing_key = "fedora-44-ima" + file_signing_key = "fedora-45-ima" # ELN Mass Rebuild [[consumer_config.koji_instances.primary.tags]] from = "eln-rebuild" to = "eln-rebuild" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('6d9f90a6', 'd300e724') }}" - file_signing_key = "fedora-44-ima" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" [[consumer_config.koji_instances.primary.tags]] from = "eln" to = "eln" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('6d9f90a6', 'd300e724') }}" - file_signing_key = "fedora-44-ima" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" # ELN Side tags @@ -310,10 +338,17 @@ handlers = ["console"] from = '-signing-pending' to = '-testing-pending' trusted_taggers = ['bodhi'] - file_signing_key = "fedora-44-ima" + file_signing_key = "fedora-45-ima" # openh264 signing + [[consumer_config.koji_instances.primary.tags]] + from = "f45-openh264" + to = "f45-openh264" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('f577861e', 'd300e724') }}" + file_signing_key = "fedora-45-ima" + [[consumer_config.koji_instances.primary.tags]] from = "f44-openh264" to = "f44-openh264" @@ -364,17 +399,17 @@ handlers = ["console"] [consumer_config.ostree_refs."fedora/rawhide/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" [consumer_config.ostree_refs."fedora/stable/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" @@ -459,19 +494,57 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + # f44 silveblue ostree refs + + [consumer_config.ostree_refs."fedora/44/x86_64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # rawhide silveblue ostree refs [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" # f42 kinoite ostree refs @@ -549,19 +622,57 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + # f44 kinoite ostree refs + + [consumer_config.ostree_refs."fedora/44/x86_64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # rawhide kinoite ostree refs [consumer_config.ostree_refs."fedora/rawhide/aarch64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" # f42 sericea ostree refs @@ -639,19 +750,57 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + # f44 sericea ostree refs + + [consumer_config.ostree_refs."fedora/44/x86_64/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # rawhide sericea ostree refs [consumer_config.ostree_refs."fedora/rawhide/aarch64/sericea"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/sericea"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/sericea"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" # f42 onyx ostree refs @@ -729,19 +878,57 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + # f44 onyx ostree refs + + [consumer_config.ostree_refs."fedora/44/x86_64/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/ppc64le/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # rawhide onyx ostree refs [consumer_config.ostree_refs."fedora/rawhide/aarch64/onyx"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/onyx"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/onyx"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" # f42 cosmic-atomic ostree refs @@ -795,15 +982,41 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + # f44 cosmic-atomic ostree refs + + [consumer_config.ostree_refs."fedora/44/x86_64/cosmic-atomic"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/cosmic-atomic"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/updates/cosmic-atomic"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/x86_64/testing/cosmic-atomic"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/updates/cosmic-atomic"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/44/aarch64/testing/cosmic-atomic"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + # rawhide cosmic-atomic ostree refs [consumer_config.ostree_refs."fedora/rawhide/aarch64/cosmic-atomic"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/cosmic-atomic"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-44', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-45', 'testkey') }}" [consumer_config.coreos] bucket = "fcos-builds" diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 9102df2ad2..5c007dd72d 100644 --- a/vars/all/FedoraBranched.yaml +++ b/vars/all/FedoraBranched.yaml @@ -1,2 +1,2 @@ --- -FedoraBranched: False +FedoraBranched: True diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml index 5d10619450..73fc84f068 100644 --- a/vars/all/FedoraBranchedBodhi.yaml +++ b/vars/all/FedoraBranchedBodhi.yaml @@ -4,4 +4,4 @@ # postbeta: After beta release and before final release # current: After final release --- -FedoraBranchedBodhi: current +FedoraBranchedBodhi: preenable