From 5f164c7347e7a7b3e49095baab08925f529c9f1e Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Mon, 12 Aug 2024 10:17:41 +0530 Subject: [PATCH] Branch Fedora 41 from Rawhide Signed-off-by: Samyak Jain --- roles/bodhi2/backend/files/new-updates-sync | 44 ++++++++++++++++++- roles/bodhi2/backend/tasks/main.yml | 2 +- .../backend/templates/koji_sync_listener.toml | 3 ++ .../backend/templates/pungi.rpm.conf.j2 | 2 + roles/koji_hub/templates/hub.conf.j2 | 1 + .../greenwave/templates/fedora.yaml | 1 + roles/packages3/web/files/distmappings.py | 6 ++- .../pkgdb-gnome-software-collections.json | 13 +++++- roles/releng/files/branched | 4 +- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- 11 files changed, 72 insertions(+), 8 deletions(-) diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index fea0f4ea79..2139b6140d 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 = {'f40': {'topic': 'fedora', +RELEASES = {'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')} + ]}} + }, + 'f40': {'topic': 'fedora', 'version': '40', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 56bd12edbc..32597553e2 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 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 f42 f41 f40 f39 f39-flatpak 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 56d2b477c7..93184bf7a9 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 = [ + "f42", + "f42-container", + "f42-flatpak", "f41", "f41-container", "f41-flatpak", diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 9bf518867d..2058b22bfa 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -29,6 +29,8 @@ sigkeys = [ 'a15B79cc', [% elif release.version_int == 41 %] 'e99d6ad1', +[% elif release.version_int == 42 %] + '105ef944', [% elif release.version_int == 6 %] '0608b895', [% elif release.version_int == 7 %] diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 6e19dd0fac..77bf58e0de 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -195,6 +195,7 @@ package_list = all :: deny sidetag = + tag f42-build :: allow tag f41-build :: allow tag f40-build :: allow tag f39-build :: allow diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml index 957317e1bb..6ef5021b59 100644 --- a/roles/openshift-apps/greenwave/templates/fedora.yaml +++ b/roles/openshift-apps/greenwave/templates/fedora.yaml @@ -126,6 +126,7 @@ rules: [] id: "kojibuild_bodhipush_remoterule" product_versions: - fedora-rawhide + - fedora-42 - fedora-41 - fedora-40 - fedora-39 diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index bcda2728ee..75f5594854 100644 --- a/roles/packages3/web/files/distmappings.py +++ b/roles/packages3/web/files/distmappings.py @@ -1,6 +1,10 @@ # Global list of koji tags we care about -tags = ({'name': 'Rawhide', 'tag': 'f41'}, +tags = ({'name': 'Rawhide', 'tag': 'f42'}, + {'name': 'Fedora 41', 'tag': 'f41-updates'}, + {'name': 'Fedora 41', 'tag': 'f41'}, + {'name': 'Fedora 41 Testing', 'tag': 'f41-updates-testing'}, + {'name': 'Fedora 40', 'tag': 'f40-updates'}, {'name': 'Fedora 40', 'tag': 'f40'}, {'name': 'Fedora 40 Testing', 'tag': 'f40-updates-testing'}, diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 3517f848bc..ad90d7eb4b 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -1,12 +1,23 @@ { "collections": [ + { + "allow_retire": true, + "branchname": "master", + "date_created": "2014-05-14 12:36:15", + "date_updated": "2024-08-13 14:07:23", + "dist_tag": ".fc42", + "koji_name": "rawhide", + "name": "Fedora Linux", + "status": "Under Development", + "version": "devel" + }, { "allow_retire": true, "branchname": "master", "date_created": "2014-05-14 12:36:15", "date_updated": "2024-02-13 13:07:23", "dist_tag": ".fc41", - "koji_name": "rawhide", + "koji_name": "f41", "name": "Fedora Linux", "status": "Under Development", "version": "devel" diff --git a/roles/releng/files/branched b/roles/releng/files/branched index d530f46237..c86fdc1c9f 100644 --- a/roles/releng/files/branched +++ b/roles/releng/files/branched @@ -1,3 +1,3 @@ # branched compose -# MAILTO=releng-cron@lists.fedoraproject.org -# 15 7 * * * root touch /tmp/fedora-compose-branched && TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && /usr/local/bin/lock-wrapper branched-compose "LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary && rm /tmp/fedora-compose-branched +MAILTO=releng-cron@lists.fedoraproject.org +15 7 * * * root touch /tmp/fedora-compose-branched && TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && /usr/local/bin/lock-wrapper branched-compose "LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary && rm /tmp/fedora-compose-branched diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 14b99820be..2b54595267 100644 --- a/vars/all/FedoraBranched.yaml +++ b/vars/all/FedoraBranched.yaml @@ -1 +1 @@ -FedoraBranched: False +FedoraBranched: True diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml index 1e152cfba7..aba8be21c8 100644 --- a/vars/all/FedoraBranchedBodhi.yaml +++ b/vars/all/FedoraBranchedBodhi.yaml @@ -3,4 +3,4 @@ # prebeta: After bodhi enablement/beta freeze and before beta release # postbeta: After beta release and before final release # current: After final release -FedoraBranchedBodhi: current +FedoraBranchedBodhi: preenable