diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 944013c4cc..c3e67e8537 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -26,7 +26,49 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/' -RELEASES = {'f41': {'topic': 'fedora', +RELEASES = {'f42': {'topic': 'fedora', + 'version': '42', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f42-updates', + 'ostrees': [{'ref': 'fedora/42/%(arch)s/updates/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/42/%(arch)s/updates/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/42/%(arch)s/updates/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/42/%(arch)s/updates/onyx', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '42', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '42', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f42-updates-testing', + 'ostrees': [{'ref': 'fedora/42/%(arch)s/testing/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/42/%(arch)s/testing/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/42/%(arch)s/testing/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/42/%(arch)s/testing/onyx', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '42', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '42', 'Everything')} + ]}} + }, + 'f41': {'topic': 'fedora', 'version': '41', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index a6fd6d2015..09e25c1c2c 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 f42 f41 f40 f39 f39-flatpak epel10.0 epel9 epel9-next epel8'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f43 f42 f41 f40 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 93184bf7a9..5ea7657d43 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -36,6 +36,9 @@ arguments = {} # XXX If you modify this taglist. Please also modify the other copy in # bodhi2/backend/tasks/main.yml taglist = [ + "f43", + "f43-container", + "f43-flatpak", "f42", "f42-container", "f42-flatpak", diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 530bc526fa..1cc148d1d8 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -41,6 +41,8 @@ sigkeys = [ 'e99d6ad1', [% elif release.version == '42' %] '105ef944', +[% elif release.version == '43' %] + '31645531', [% 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 83cc2b8b52..123519044a 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -226,6 +226,7 @@ package_list = all :: deny sidetag = + tag f43-build :: allow tag f42-build :: allow tag f41-build :: allow tag f40-build :: allow diff --git a/roles/openshift-apps/poddlers/templates/fedora-messaging.toml b/roles/openshift-apps/poddlers/templates/fedora-messaging.toml index 42a57bce7c..d18ce527a9 100644 --- a/roles/openshift-apps/poddlers/templates/fedora-messaging.toml +++ b/roles/openshift-apps/poddlers/templates/fedora-messaging.toml @@ -333,6 +333,10 @@ stable_api = '2024-05-31' security_fixes = '2024-05-31' bug_fixes = '2024-05-31' +[consumer_config.scm_request_processor.branch_slas.f42] +bug_fixes = '2026-05-13' +security_fixes = '2026-05-13' + [consumer_config.scm_request_processor.branch_slas.f41] bug_fixes = '2025-11-11' security_fixes = '2025-11-11' diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index 75f5594854..84f0f784f5 100644 --- a/roles/packages3/web/files/distmappings.py +++ b/roles/packages3/web/files/distmappings.py @@ -1,5 +1,9 @@ # Global list of koji tags we care about -tags = ({'name': 'Rawhide', 'tag': 'f42'}, +tags = ({'name': 'Rawhide', 'tag': 'f43'}, + + {'name': 'Fedora 42', 'tag': 'f42-updates'}, + {'name': 'Fedora 42', 'tag': 'f42'}, + {'name': 'Fedora 42 Testing', 'tag': 'f42-updates-testing'}, {'name': 'Fedora 41', 'tag': 'f41-updates'}, {'name': 'Fedora 41', 'tag': 'f41'}, diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 79bcf2949e..836c305c3b 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -11,6 +11,17 @@ "status": "Under Development", "version": "devel" }, + { + "allow_retire": true, + "branchname": "f42", + "date_created": "2024-05-14 12:36:15", + "date_updated": "2025-02-04 14:07:23", + "dist_tag": ".fc42", + "koji_name": "f42", + "name": "Fedora Linux", + "status": "Under Development", + "version": "42" + }, { "allow_retire": true, "branchname": "master", diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 6a038e205a..ed1752dbb1 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-42-ima" + [[consumer_config.koji_instances.primary.tags]] + from = "f43-infra-candidate" + to = "f43-infra-stg" + key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" + file_signing_key = "fedora-43-ima" + # Gated coreos-pool tag [[consumer_config.koji_instances.primary.tags]] @@ -156,8 +163,38 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('105ef944', 'd300e724') }}" file_signing_key = "fedora-42-ima" + [[consumer_config.koji_instances.primary.tags]] + from = "f43-coreos-signing-pending" + to = "coreos-pool" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('31645531', 'd300e724') }}" + file_signing_key = "fedora-43-ima" + # Gated rawhide + [[consumer_config.koji_instances.primary.tags]] + from = "f43-signing-pending" + to = "f43-updates-testing-pending" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('31645531', 'd300e724') }}" + file_signing_key = "fedora-43-ima" + + [consumer_config.koji_instances.primary.tags.sidetags] + pattern = 'f43-build-side-' + from = '-signing-pending' + to = '-testing-pending' + trusted_taggers = ['bodhi'] + file_signing_key = "fedora-43-ima" + + [[consumer_config.koji_instances.primary.tags]] + from = "f43-pending" + to = "f43" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('31645531', 'd300e724') }}" + file_signing_key = "fedora-43-ima" + + # Branched + [[consumer_config.koji_instances.primary.tags]] from = "f42-signing-pending" to = "f42-updates-testing-pending" @@ -172,24 +209,8 @@ handlers = ["console"] trusted_taggers = ['bodhi'] file_signing_key = "fedora-42-ima" - [[consumer_config.koji_instances.primary.tags]] - from = "f42-pending" - to = "f42" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('105ef944', 'd300e724') }}" - file_signing_key = "fedora-42-ima" + # stable releases - # resigning f42 builds with f43 key before branching. Remove after branching. - [[consumer_config.koji_instances.primary.tags]] - from = "f42" - to = "f42" - key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('31645531', 'd300e724') }}" - file_signing_key = "fedora-43-ima" - - - # Branched - [[consumer_config.koji_instances.primary.tags]] from = "f41-signing-pending" to = "f41-updates-testing-pending" @@ -204,8 +225,6 @@ handlers = ["console"] trusted_taggers = ['bodhi'] file_signing_key = "fedora-41-ima" - # stable releases - [[consumer_config.koji_instances.primary.tags]] from = "f40-signing-pending" to = "f40-updates-testing-pending" @@ -321,6 +340,13 @@ handlers = ["console"] # openh264 signing + [[consumer_config.koji_instances.primary.tags]] + from = "f43-openh264" + to = "f43-openh264" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('31645531', 'd300e724') }}" + file_signing_key = "fedora-43-ima" + [[consumer_config.koji_instances.primary.tags]] from = "f42-openh264" to = "f42-openh264" @@ -379,17 +405,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-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" [consumer_config.ostree_refs."fedora/stable/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" @@ -474,19 +500,57 @@ handlers = ["console"] 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"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', '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-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" # f40 kinoite ostree refs @@ -564,20 +628,57 @@ handlers = ["console"] 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"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', '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-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" # f40 sericea ostree refs @@ -655,19 +756,57 @@ handlers = ["console"] 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"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/updates/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/testing/sericea"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', '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-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/sericea"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/sericea"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" # f40 onyx ostree refs @@ -745,19 +884,57 @@ handlers = ["console"] 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"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/x86_64/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/aarch64/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/updates/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/42/ppc64le/testing/onyx"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-42', '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-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/onyx"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/onyx"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-42', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-43', 'testkey') }}" [consumer_config.coreos] bucket = "fcos-builds" diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 1520e826ef..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