PR#2449: Branch Fedora 42 from Rawhide - fedora-infra/ansible

fedora-infra / ansible

#2449 Branch Fedora 42 from Rawhide

Merged 2 months ago by jnsamyak. Opened 2 months ago by jnsamyak.

fedora-infra/ jnsamyak/ansible f42_massbranching into main

Branch Fedora 42 from Rawhide

Samyak Jain • 2 months ago

fd17adc

roles/bodhi2/backend/files/new-updates-sync

file modified

+43 -1

		`@@ -26,7 +26,49 @@`
		`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': {`

roles/bodhi2/backend/tasks/main.yml

file modified

+1 -1

		`@@ -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"`

roles/bodhi2/backend/templates/koji_sync_listener.toml

file modified

		`@@ -36,6 +36,9 @@`
		`# 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",`

roles/bodhi2/backend/templates/pungi.rpm.conf.j2

file modified

		`@@ -41,6 +41,8 @@`
		`'e99d6ad1',`
		`[% elif release.version == '42' %]`
		`'105ef944',`
		`+ [% elif release.version == '43' %]`
		`+ '31645531',`
		`[% elif release.version == '6' %]`
		`'0608b895',`
		`[% elif release.version == '7' %]`

roles/koji_hub/templates/hub.conf.j2

file modified

		`@@ -226,6 +226,7 @@`
		`all :: deny`

		`sidetag =`
		`+ tag f43-build :: allow`
		`tag f42-build :: allow`
		`tag f41-build :: allow`
		`tag f40-build :: allow`

roles/openshift-apps/poddlers/templates/fedora-messaging.toml

file modified

		`@@ -333,6 +333,10 @@`
		`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'`

roles/packages3/web/files/distmappings.py

file modified

+5 -1

		`@@ -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'},`

roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json

file modified

+11

		`@@ -13,6 +13,17 @@`
		`},`
		`{`
		`"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",`
		`"date_created": "2014-05-14 12:36:15",`
		`"date_updated": "2024-02-13 13:07:23",`

roles/robosignatory/templates/robosignatory.toml.j2

file modified

+212 -35

		`@@ -133,6 +133,13 @@`
		`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,9 +163,39 @@`
		`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-<seq_id>'`
		`+ from = '<sidetag>-signing-pending'`
		`+ to = '<sidetag>-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"`
		`key = "{{ (env == 'production')\|ternary('fedora-42', 'testkey') }}"`
		`@@ -172,24 +209,8 @@`
		`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"`
		`-`
		`- # 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"`
		`-`
		`+ # stable releases`

		`- # Branched`
		`-`
		`[[consumer_config.koji_instances.primary.tags]]`
		`from = "f41-signing-pending"`
		`to = "f41-updates-testing-pending"`
		`@@ -204,8 +225,6 @@`
		`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"`
		`@@ -322,6 +341,13 @@`
		`# 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"`
		`key = "{{ (env == 'production')\|ternary('fedora-42', 'testkey') }}"`
		`@@ -379,17 +405,17 @@`

		`[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 @@`
		`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 @@`
		`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 @@`
		`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 @@`
		`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"`

vars/all/FedoraBranched.yaml

file modified

+1 -1

		`@@ -1,2 +1,2 @@`
		`---`
		`- FedoraBranched: false`
		`+ FedoraBranched: True`

vars/all/FedoraBranchedBodhi.yaml

file modified

+1 -1

		`@@ -4,4 +4,4 @@`
		`# postbeta: After beta release and before final release`
		`# current: After final release`
		`---`
		`- FedoraBranchedBodhi: current`
		`+ FedoraBranchedBodhi: preenable`

jnsamyak commented 2 months ago

Hello folks this is regarding the mass branching;

Things that are taken off:

Remove resigning of f42 with f41 keys
updated artifacts to f42 and rawhide to f43;
updated infra-candidate/openh264 for new f43
f42 signing pending, buildsidetags, etc
updated toddler config for f42
set fedora branched vars to true and preenable state
added f42 to new-updates-sync
There were awesome changes by adam which introduced templating of various nightly crons, hence some less changes to do this time regarding those, but happy to have another pair of eyes if I left something.

Some key things to look at in the review:

Q. anything obvious that is missing
Q: are we missing any artifacts?
Q: please check the bug_fixes, and security_fixes that need to be added to the toddler coming/Is anything to do in poddlers?

and reviews!!

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

zuul commented 2 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/c53e6064ec104e9282a78a65e0df0ade

fi-ansible-lint-diff : FAILURE in 2m 30s
fi-yamllint-diff : SUCCESS in 2m 15s

rebased onto d836991

2 months ago

zuul commented 2 months ago

fi-ansible-lint-diff : FAILURE in 2m 22s
fi-yamllint-diff : SUCCESS in 2m 18s

kevin commented on line 6 of roles/bodhi2/backend/tasks/main.yml 2 months ago

remove 39 here? Also, why don't we have f40-flatpak / f41-flatpak etc?

kevin commented on line 6 of roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json 2 months ago

2024?

kevin commented 2 months ago

Other than those 2, the rest looks ok.

rebased onto 7b58dfd

2 months ago

zuul commented 2 months ago

fi-ansible-lint-diff : FAILURE in 2m 15s
fi-yamllint-diff : SUCCESS in 2m 19s

rebased onto e9b150f

2 months ago

rebased onto e9b150f

2 months ago

zuul commented 2 months ago

fi-ansible-lint-diff : FAILURE in 2m 12s
fi-yamllint-diff : SUCCESS in 2m 13s

rebased onto 04bc8ed

2 months ago

rebased onto 04bc8ed

2 months ago

Pull-Request has been merged by jnsamyak

2 months ago

zuul commented 2 months ago

fi-ansible-lint-diff : FAILURE in 2m 26s
fi-yamllint-diff : SUCCESS in 2m 18s

siosm commented 2 months ago

Can someone verify that the equivalent of https://pagure.io/fedora-infra/ansible/pull-request/1318 has been done for F42? Thanks

kevin commented 2 months ago

Yep.

                [% if release.version == "42" %]
                    [# For F42 the compose location is going to be under /compose/branched/ #]
                    "https://kojipkgs{env_suffix}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version ]]/compose/Everything/$basearch/os/"

siosm commented 2 months ago

We indeed did that on F42 GA so a while back. Thanks!

siosm commented 2 months ago

F41 GA*