Branch Fedora 40 from Rawhide

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

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 = {'f39': {'topic': 'fedora',
+RELEASES = {'f40': {'topic': 'fedora',
+                    'version': '40',
+                    'modules': ['fedora', 'fedora-secondary'],
+                    'repos': {'updates': {
+                        'from': 'f40-updates',
+                        'ostrees': [{'ref': 'fedora/40/%(arch)s/updates/silverblue',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/40/%(arch)s/updates/kinoite',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/40/%(arch)s/updates/sericea',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/40/%(arch)s/updates/onyx',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']}],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'source'],
+                                'dest': os.path.join(FEDORADEST, '40', 'Everything')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, '40', 'Everything')}
+                              ]},
+                              'updates-testing': {
+                        'from': 'f40-updates-testing',
+                        'ostrees': [{'ref': 'fedora/40/%(arch)s/testing/silverblue',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/40/%(arch)s/testing/kinoite',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/40/%(arch)s/testing/sericea',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/40/%(arch)s/testing/onyx',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']}],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '40', 'Everything')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '40', 'Everything')}
+                              ]}}
+                   },
+            'f39': {'topic': 'fedora',
                     'version': '39',
                     'modules': ['fedora', 'fedora-secondary'],
                     'repos': {'updates': {

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 f40 f39 f39-flatpak f38 f38-container f38-modular epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'"
+      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f41 f40 f39 f39-flatpak f38 f38-container f38-modular epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'"
       cron_file=update-koji-owner
       user=apache
   when: env == "production"

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 = [
+    "f41",
+    "f41-container",
+    "f41-flatpak",
     "f40",
     "f40-container",
     "f40-flatpak",

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

@@ -39,6 +39,8 @@ sigkeys = [
     '18B8e74c',
 [% elif release.version_int == 40 %]
     'a15B79cc',
+[% elif release.version_int == 41 %]
+    'e99d6ad1',
 [% elif release.version_int == 8 %]
     '2f86d6a1',
 [% endif %]

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

@@ -51,6 +51,8 @@ sigkeys = [
     '18B8e74c',
 [% elif release.version_int == 40 %]
     'a15B79cc',
+[% elif release.version_int == 41 %]
+    'e99d6ad1',
 [% elif release.version_int == 6 %]
     '0608b895',
 [% elif release.version_int == 7 %]

roles/koji_hub/templates/hub.conf.j2

@@ -199,6 +199,7 @@ package_list =
     all :: deny
 
 sidetag =
+    tag f41-build :: allow
     tag f40-build :: allow
     tag f39-build :: allow
     tag f38-build :: allow

roles/openshift-apps/greenwave/templates/fedora.yaml

@@ -116,6 +116,7 @@ rules: []
 id: "kojibuild_bodhipush_remoterule"
 product_versions:
   - fedora-rawhide
+  - fedora-41
   - fedora-40
   - fedora-39
   - fedora-38

roles/packages3/web/files/distmappings.py

@@ -1,5 +1,9 @@
 # Global list of koji tags we care about
-tags = ({'name': 'Rawhide', 'tag': 'f40'},
+tags = ({'name': 'Rawhide', 'tag': 'f41'},
+
+        {'name': 'Fedora 40', 'tag': 'f40-updates'},
+        {'name': 'Fedora 40', 'tag': 'f40'},
+        {'name': 'Fedora 40 Testing', 'tag': 'f40-updates-testing'},
         
         {'name': 'Fedora 39', 'tag': 'f39-updates'},
         {'name': 'Fedora 39', 'tag': 'f39'},

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-02-13 13:07:23",
+      "dist_tag": ".fc41",
+      "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": "2023-08-08 17:07:23",
       "dist_tag": ".fc40",
-      "koji_name": "rawhide",
+      "koji_name": "f40",
       "name": "Fedora Linux",
       "status": "Under Development",
       "version": "devel"

roles/releng/files/branched

@@ -1,3 +1,3 @@
 # branched compose
-# MAILTO=releng-cron@lists.fedoraproject.org
+MAILTO=releng-cron@lists.fedoraproject.org
-# 15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && /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
+15 7 * * * root 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

vars/all/FedoraBranched.yaml

@@ -1 +1 @@
-FedoraBranched: False
+FedoraBranched: True

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