F36 branching

Signed-off-by: Tomas Hrcka <thrcka@redhat.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 = {'f35': {'topic': 'fedora',
+RELEASES = {'f36': {'topic': 'fedora',
+                    'version': '36',
+                    'modules': ['fedora', 'fedora-secondary'],
+                    'repos': {'updates': {
+                        'from': 'f36-updates',
+                        'ostrees': [{'ref': 'fedora/36/%(arch)s/updates/silverblue',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/36/%(arch)s/updates/kinoite',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']}],
+                        'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
+                                'dest': os.path.join(FEDORADEST, '36', 'Everything')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, '36', 'Everything')}
+                              ]},
+                              'updates-testing': {
+                        'from': 'f36-updates-testing',
+                        'ostrees': [{'ref': 'fedora/36/%(arch)s/testing/silverblue',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']},
+                                    {'ref': 'fedora/36/%(arch)s/testing/kinoite',
+                                     'dest': OSTREEDEST,
+                                     'arches': ['x86_64', 'ppc64le', 'aarch64']}],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '36', 'Everything')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '36', 'Everything')}
+                              ]}}
+                   },
+            'f36m': {'topic': 'fedora',
+                    'version': '36m',
+                    'modules': ['fedora', 'fedora-secondary'],
+                    'repos': {'updates': {
+                        'from': 'f36-modular-updates',
+                        'ostrees': [],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST, '36', 'Modular')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, '36', 'Modular')}
+                              ]},
+                              'updates-testing': {
+                        'from': 'f36-modular-updates-testing',
+                        'ostrees': [],
+                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
+                                'dest': os.path.join(FEDORADEST, 'testing', '36', 'Modular')},
+                               {'arches': ['ppc64le', 's390x'],
+                                'dest': os.path.join(FEDORAALTDEST, 'testing', '36', 'Modular')}
+                              ]}}
+                   },
+            'f35': {'topic': 'fedora',
                     'version': '35',
                     '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 f36 f36-container f36-modular f35 f35-container f35-modular f34 f34-container f34-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 f37 f37-container f37-modular f36 f36-container f36-modular f35 f35-container f35-modular f34 f34-container f34-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'"
       cron_file=update-koji-owner
   when: env == "production"
   tags:

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 = [
+    "f37",
+    "f37-container",
+    "f37-modular",
+    "f37-flatpak",
     "f36",
     "f36-container",
     "f36-modular",

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

@@ -26,6 +26,8 @@ sigkeys = [
     '9867c58f',
 [% elif release.version_int == 36 %]
     '38ab71f4',
+[% elif release.version_int == 37 %]
+    '5323552a',
 [% elif release.version_int == 8 %]
         '2f86d6a1',
 [% endif %]

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

@@ -39,6 +39,8 @@ sigkeys = [
     '9867c58f',
 [% elif release.version_int == 36 %]
     '38ab71f4',
+[% elif release.version_int == 37 %]
+    '5323552a',
 [% elif release.version_int == 6 %]
     '0608b895',
 [% elif release.version_int == 7 %]

roles/koji_hub/templates/hub.conf.j2

@@ -181,6 +181,7 @@ package_list =
     all :: deny
 
 sidetag =
+    tag f37-build :: allow
     tag f36-build :: allow
     tag f35-build :: allow
     tag f34-build :: allow

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

@@ -0,0 +1,28 @@
+data:
+  description: Fedora 37 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: f37
+  summary: Fedora 37 traditional base
+  context: 00000000
+  version: 1
+  xmd:
+    mbs:
+      buildrequires: {}
+      commit: f37
+      requires: {}
+      koji_tag: module-f37-build
+      mse: TRUE
+      virtual_streams: [fedora]
+document: modulemd
+version: 1
+  

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

@@ -66,6 +66,7 @@ rules: []
 id: "kojibuild_bodhipush_remoterule"
 product_versions:
   - fedora-rawhide
+  - fedora-37
   - fedora-36
   - fedora-35
   - fedora-34

roles/packages3/web/files/distmappings.py

@@ -1,5 +1,9 @@
 # Global list of koji tags we care about
-tags = ({'name': 'Rawhide', 'tag': 'f36'},
+tags = ({'name': 'Rawhide', 'tag': 'f37'},
+
+        {'name': 'Fedora 36', 'tag': 'f36-updates'},
+        {'name': 'Fedora 36', 'tag': 'f36'},
+        {'name': 'Fedora 36 Testing', 'tag': 'f36-updates-testing'},
 
         {'name': 'Fedora 35', 'tag': 'f35-updates'},
         {'name': 'Fedora 35', 'tag': 'f35'},

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": "2020-08-10 17:07:23",
+      "date_updated": "2020-02-08 17:07:23",
-      "dist_tag": ".fc36",
+      "dist_tag": ".fc37",
       "koji_name": "rawhide",
       "name": "Fedora Linux",
       "status": "Under Development",
@@ -15,9 +15,9 @@
       "allow_retire": true,
       "branchname": "master",
       "date_created": "2014-05-14 12:36:15",
-      "date_updated": "2020-08-10 17:07:23",
+      "date_updated": "2020-02-08 17:07:23",
       "dist_tag": ".fc36",
-      "koji_name": "rawhide",
+      "koji_name": "fc36",
       "name": "Fedora",
       "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 f35 && /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 f35 && /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

@@ -125,6 +125,12 @@ handlers = ["console"]
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f37-infra-candidate"
+            to = "f37-infra-stg"
+            key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
+
             # Gated coreos-pool tag
 
             [[consumer_config.koji_instances.primary.tags]]
@@ -145,9 +151,50 @@ handlers = ["console"]
             key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}"
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f37-coreos-signing-pending"
+            to = "coreos-pool"
+            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
 
             # Gated rawhide and branched
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f37-signing-pending"
+            to = "f37-updates-testing-pending"
+            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
+            {% if env == "production" %}
+            # ima file signing - disable for now per fesco
+            # file_signing_key = "fedora-files-2021"
+            {% endif %}
+
+            [consumer_config.koji_instances.primary.tags.sidetags]
+            pattern = 'f37-build-side-<seq_id>'
+            from = '<sidetag>-signing-pending'
+            to = '<sidetag>-testing-pending'
+            trusted_taggers = ['bodhi']
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f37-pending"
+            to = "f37"
+            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f37-modular-pending"
+            to = "f37-modular"
+            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
+            type = "modular"
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f37-modular-updates-candidate"
+            to = "f37-modular"
+            key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}"
+            type = "modular"
+
             [[consumer_config.koji_instances.primary.tags]]
             from = "f36-signing-pending"
             to = "f36-updates-testing-pending"
@@ -394,12 +441,22 @@ 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-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/armhfp/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+
+        [consumer_config.ostree_refs."fedora/devel/x86_64/iot"]
+        directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/devel/aarch64/iot"]
+        directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/devel/armhfp/iot"]
+        directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
         key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/devel/x86_64/iot"]
@@ -506,15 +563,43 @@ handlers = ["console"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
 
+        [consumer_config.ostree_refs."fedora/36/x86_64/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/aarch64/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/ppc64le/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/x86_64/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/x86_64/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/aarch64/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/aarch64/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/ppc64le/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/ppc64le/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
 
         [consumer_config.ostree_refs."fedora/35/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
@@ -544,15 +629,44 @@ handlers = ["console"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
 
+        [consumer_config.ostree_refs."fedora/36/x86_64/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/aarch64/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/ppc64le/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/x86_64/updates/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/x86_64/testing/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/aarch64/updates/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/aarch64/testing/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/ppc64le/updates/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/36/ppc64le/testing/kinoite"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+        key = "{{ (env == 'production')|ternary('fedora-37', '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