Branch Fedora 38 from rawhide

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

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

@@ -26,7 +26,57 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/'
 EPELDEST = '/pub/epel/'
 OSTREESOURCE = '/mnt/koji/compose/ostree/repo/'
 OSTREEDEST = '/mnt/koji/ostree/repo/'
-RELEASES = {'f37': {'topic': 'fedora',
+RELEASES = {'f38': {'topic': 'fedora',
+                    'version': '38',
+                    'modules': ['fedora', 'fedora-secondary'],
+                    'repos': {'updates': {
+                        'from': 'f38-updates',
+                        'ostrees': [{'ref': 'fedora/38/%(arch)s/updates/silverblue',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/38/%(arch)s/updates/kinoite',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']}],
+                        'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
+                                'dest': os.path.join(FEDORADEST, '38', 'Everything')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, '38', 'Everything')}
+                              ]},
+                              'updates-testing': {
+                        'from': 'f38-updates-testing',
+                        'ostrees': [{'ref': 'fedora/38/%(arch)s/testing/silverblue',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/38/%(arch)s/testing/kinoite',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']}],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '38', 'Everything')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '38', 'Everything')}
+                              ]}}
+                   },
+            'f38m': {'topic': 'fedora',
+                    'version': '38m',
+                    'modules': ['fedora', 'fedora-secondary'],
+                    'repos': {'updates': {
+                        'from': 'f38-modular-updates',
+                        'ostrees': [],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'source'],
+                                'dest': os.path.join(FEDORADEST, '38', 'Modular')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, '38', 'Modular')}
+                              ]},
+                              'updates-testing': {
+                        'from': 'f38-modular-updates-testing',
+                        'ostrees': [],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '38', 'Modular')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '38', 'Modular')}
+                              ]}}
+                   },
+            'f37': {'topic': 'fedora',
                     'version': '37',
                     'modules': ['fedora', 'fedora-secondary'],
                     'repos': {'updates': {

roles/bodhi2/backend/tasks/main.yml

@@ -87,7 +87,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 f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'"
+      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f39 f39-container f39-modular f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular epel9 epel9-next epel8 epel8-next epel8-modular 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,10 @@ arguments = {}
 # XXX If you modify this taglist.  Please also modify the other copy in
 # bodhi2/backend/tasks/main.yml
 taglist = [
+    "f39",
+    "f39-container",
+    "f39-modular",
+    "f39-flatpak",
     "f38",
     "f38-container",
     "f38-modular",

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

@@ -30,6 +30,8 @@ sigkeys = [
     '5323552a',
 [% elif release.version_int == 38 %]
     'eb10b464',
+[% elif release.version_int == 39 %]
+    '18B8e74c',
 [% elif release.version_int == 8 %]
         '2f86d6a1',
 [% endif %]

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

@@ -43,6 +43,8 @@ sigkeys = [
     '5323552a',
 [% elif release.version_int == 38 %]
     'eb10b464',
+[% elif release.version_int == 39 %]
+    '18B8e74c',
 [% elif release.version_int == 6 %]
     '0608b895',
 [% elif release.version_int == 7 %]

roles/koji_hub/templates/hub.conf.j2

@@ -191,6 +191,7 @@ package_list =
     all :: deny
 
 sidetag =
+    tag f39-build :: allow
     tag f38-build :: allow
     tag f37-build :: allow
     tag f36-build :: allow

roles/mbs/common/files/default-modules.production/platform-f39.yaml

@@ -0,0 +1,27 @@
+data:
+  description: Fedora 39 traditional base
+  license:
+    module: [MIT]
+  name: platform
+  profiles:
+    buildroot:
+      rpms: [bash, bzip2, coreutils, cpio, diffutils, fedora-release, findutils, gawk,
+        glibc-minimal-langpack, grep, gzip, info, make, patch, redhat-rpm-config,
+        rpm-build, sed, shadow-utils, tar, unzip, util-linux, which, xz]
+    srpm-buildroot:
+      rpms: [bash, fedora-release, fedpkg-minimal, glibc-minimal-langpack, gnupg2,
+        redhat-rpm-config, rpm-build, shadow-utils]
+  stream: f39
+  summary: Fedora 39 traditional base
+  context: 00000000
+  version: 1
+  xmd:
+    mbs:
+      buildrequires: {}
+      commit: f39
+      requires: {}
+      koji_tag: module-f39-build
+      mse: TRUE
+      virtual_streams: [fedora]
+document: modulemd
+version: 1

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

@@ -116,6 +116,7 @@ rules: []
 id: "kojibuild_bodhipush_remoterule"
 product_versions:
   - fedora-rawhide
+  - fedora-39
   - fedora-38
   - fedora-37
   - fedora-36
@@ -154,6 +155,7 @@ product_versions:
   # release is branched (or goes EOL).
   - fedora-36
   - fedora-37
+  - fedora-38
 decision_contexts:
   - bodhi_update_push_testing_critpath
   - bodhi_update_push_testing_core_critpath

roles/packages3/web/files/distmappings.py

@@ -1,5 +1,9 @@
 # Global list of koji tags we care about
-tags = ({'name': 'Rawhide', 'tag': 'f38'},
+tags = ({'name': 'Rawhide', 'tag': 'f39'},
+
+        {'name': 'Fedora 38', 'tag': 'f38-updates'},
+        {'name': 'Fedora 38', 'tag': 'f38'},
+        {'name': 'Fedora 38 Testing', 'tag': 'f38-updates-testing'},
 
         {'name': 'Fedora 37', 'tag': 'f37-updates'},
         {'name': 'Fedora 37', 'tag': 'f37'},

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

@@ -4,8 +4,8 @@
       "allow_retire": true,
       "branchname": "master",
       "date_created": "2014-05-14 12:36:15",
-      "date_updated": "2022-08-09 17:07:23",
+      "date_updated": "2023-02-07 17:07:23",
-      "dist_tag": ".fc38",
+      "dist_tag": ".fc39",
       "koji_name": "rawhide",
       "name": "Fedora Linux",
       "status": "Under Development",
@@ -33,6 +33,28 @@
       "status": "Active",
       "version": "37"
     },
+    {
+      "allow_retire": true,
+      "branchname": "master",
+      "date_created": "2014-05-14 12:36:15",
+      "date_updated": "2022-08-09 17:07:23",
+      "dist_tag": ".fc37",
+      "koji_name": "f37",
+      "name": "Fedora Linux",
+      "status": "Active",
+      "version": "37"
+    },
+    {
+      "allow_retire": true,
+      "branchname": "master",
+      "date_created": "2014-05-14 12:36:15",
+      "date_updated": "2022-08-09 17:07:23",
+      "dist_tag": ".fc37",
+      "koji_name": "f37",
+      "name": "Fedora",
+      "status": "Active",
+      "version": "37"
+    },
     {
       "allow_retire": true,
       "branchname": "master",

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 f37 && /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 f38 && /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

roles/robosignatory/templates/robosignatory.toml.j2

@@ -133,6 +133,15 @@ handlers = ["console"]
             file_signing_key = "fedora-38-ima"
             {% endif %}
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f39-infra-candidate"
+            to = "f39-infra-stg"
+            key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
+            {% if env == "production" %}
+            # ima file signing - enabled in f37
+            file_signing_key = "fedora-39-ima"
+            {% endif %}
 
             # Gated coreos-pool tag
 
@@ -162,52 +171,62 @@ handlers = ["console"]
             file_signing_key = "fedora-38-ima"
             {% endif %}
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f39-coreos-signing-pending"
+            to = "coreos-pool"
+            key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
+            {% if env == "production" %}
+            # ima file signing - enabled in f37
+            file_signing_key = "fedora-39-ima"
+            {% endif %}
 
             # Gated rawhide and branched
 
             [[consumer_config.koji_instances.primary.tags]]
-            from = "f38-signing-pending"
+            from = "f39-signing-pending"
-            to = "f38-updates-testing-pending"
+            to = "f39-updates-testing-pending"
-            key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+            key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
             {% if env == "production" %}
             # ima file signing - enabled in f37
-            file_signing_key = "fedora-38-ima"
+            file_signing_key = "fedora-39-ima"
             {% endif %}
 
             [consumer_config.koji_instances.primary.tags.sidetags]
-            pattern = 'f38-build-side-<seq_id>'
+            pattern = 'f39-build-side-<seq_id>'
             from = '<sidetag>-signing-pending'
             to = '<sidetag>-testing-pending'
             trusted_taggers = ['bodhi']
             {% if env == "production" %}
             # ima file signing - enabled in f37
-            file_signing_key = "fedora-38-ima"
+            file_signing_key = "fedora-39-ima"
             {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
-            from = "f38-pending"
+            from = "f39-pending"
-            to = "f38"
+            to = "f39"
-            key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
-            file_signing_key = "fedora-38-ima"
-            {% endif %}
-
-            # sign f38 also with the f39 key
-            # remove this after branching is over and replace with f39 tags
-
-            [[consumer_config.koji_instances.primary.tags]]
-            from = "f38"
-            to = "f38"
             key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
+            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
             {% if env == "production" %}
             # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
             {% endif %}
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f39-modular-pending"
+            to = "f39-modular"
+            key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
+            type = "modular"
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f39-modular-updates-candidate"
+            to = "f39-modular"
+            key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
+            type = "modular"
+
             [[consumer_config.koji_instances.primary.tags]]
             from = "f38-modular-pending"
             to = "f38-modular"
@@ -222,35 +241,35 @@ handlers = ["console"]
             keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
             type = "modular"
 
-            [[consumer_config.koji_instances.primary.tags]]
+            #[[consumer_config.koji_instances.primary.tags]]
-            from = "f37-signing-pending"
+            #from = "f37-signing-pending"
-            to = "f37-updates-testing-pending"
+            #to = "f37-updates-testing-pending"
-            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            #key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
+            #keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
-            {% if env == "production" %}
+            #{% if env == "production" %}
-            # ima file signing - disable for now per fesco
+            ## ima file signing - disable for now per fesco
-            file_signing_key = "fedora-37-ima"
+            #file_signing_key = "fedora-37-ima"
-            {% endif %}
+            #{% endif %}
 
-            [consumer_config.koji_instances.primary.tags.sidetags]
+            #[consumer_config.koji_instances.primary.tags.sidetags]
-            pattern = 'f37-build-side-<seq_id>'
+            #pattern = 'f37-build-side-<seq_id>'
-            from = '<sidetag>-signing-pending'
+            #from = '<sidetag>-signing-pending'
-            to = '<sidetag>-testing-pending'
+            #to = '<sidetag>-testing-pending'
-            trusted_taggers = ['bodhi']
+            #trusted_taggers = ['bodhi']
-            {% if env == "production" %}
+            #{% if env == "production" %}
-            # ima file signing - disable for now per fesco
+            ## ima file signing - disable for now per fesco
-            file_signing_key = "fedora-37-ima"
+            #file_signing_key = "fedora-37-ima"
-            {% endif %}
+            #{% endif %}
 
-            [[consumer_config.koji_instances.primary.tags]]
+            #[[consumer_config.koji_instances.primary.tags]]
-            from = "f37-pending"
+            #from = "f37-pending"
-            to = "f37"
+            #to = "f37"
-            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            #key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
+            #keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
-            {% if env == "production" %}
+            #{% if env == "production" %}
-            # ima file signing - disable for now per fesco
+            ## ima file signing - disable for now per fesco
-            file_signing_key = "fedora-37-ima"
+            #file_signing_key = "fedora-37-ima"
-            {% endif %}
+            #{% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f37-modular-pending"
@@ -412,6 +431,16 @@ handlers = ["console"]
 
             # openh264 signing
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f39-openh264"
+            to = "f39-openh264"
+            key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
+            {% if env == "production" %}
+            # ima file signing - enabled in f37
+            file_signing_key = "fedora-39-ima"
+            {% endif %}
+
             [[consumer_config.koji_instances.primary.tags]]
             from = "f38-openh264"
             to = "f38-openh264"
@@ -456,23 +485,23 @@ handlers = ["console"]
     [consumer_config.ostree_refs]
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/armhfp/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         
         [consumer_config.ostree_refs."fedora/devel/x86_64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/devel/aarch64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/devel/armhfp/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/stable/x86_64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
@@ -624,16 +653,43 @@ handlers = ["console"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
 
+        [consumer_config.ostree_refs."fedora/38/x86_64/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/aarch64/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/ppc64le/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/x86_64/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/x86_64/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/aarch64/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/aarch64/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/ppc64le/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/ppc64le/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/35/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
@@ -719,20 +775,51 @@ handlers = ["console"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
 
+        [consumer_config.ostree_refs."fedora/38/x86_64/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/aarch64/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/ppc64le/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/x86_64/updates/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/x86_64/testing/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/aarch64/updates/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/aarch64/testing/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/ppc64le/updates/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/38/ppc64le/testing/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
+        [consumer_config.ostree_refs."fedora/38/x86_64/sericea"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
 
     [consumer_config.coreos]
     bucket = "fcos-builds"

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