Branching F33 from rawhide

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>

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

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

roles/bodhi2/backend/tasks/main.yml

@@ -74,7 +74,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 f33 f33-container f33-modular f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"
+      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f34 f34-container f34-modular f33 f33-container f33-modular f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel 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 = [
+    "f34",
+    "f34-container",
+    "f34-modular",
+    "f34-flatpak",
     "f33",
     "f33-container",
     "f33-modular",

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

@@ -18,6 +18,10 @@ sigkeys = [
 	'3c3359c4',
 [% elif release.version_int == 32 %]
 	'12c944d0',
+[% elif release.version_int == 33 %]
+	'9570ff31',
+[% elif release.version_int == 34 %]
+    '45719a39',
 [% elif release.version_int == 8 %]
         '2f86d6a1',
 [% endif %]

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

@@ -33,6 +33,8 @@ sigkeys = [
     '12c944d0',
 [% elif release.version_int == 33 %]
     '9570ff31',
+[% elif release.version_int == 34 %]
+    '45719a39',
 [% elif release.version_int == 6 %]
     '0608b895',
 [% elif release.version_int == 7 %]

roles/koji_hub/templates/hub.conf.j2

@@ -184,6 +184,7 @@ package_list =
     all :: deny
 
 sidetag =
+    tag f34-build :: allow
     tag f33-build :: allow
     tag f32-build :: allow
     tag f31-build :: allow

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

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

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

@@ -54,6 +54,7 @@ id: "taskotron_release_critical_tasks_for_testing"
 product_versions:
   - fedora-rawhide
   - fedora-eln
+  - fedora-34
   - fedora-33
   - fedora-32
   - fedora-31
@@ -69,6 +70,7 @@ id: "taskotron_release_critical_tasks_for_stable"
 product_versions:
   - fedora-rawhide
   - fedora-eln
+  - fedora-34
   - fedora-33
   - fedora-32
   - fedora-31

roles/packages3/web/files/distmappings.py

@@ -1,5 +1,10 @@
 # Global list of koji tags we care about
-tags = ({'name': 'Rawhide', 'tag': 'f33'},
+tags = ({'name': 'Rawhide', 'tag': 'f34'},
+
+        {'name': 'Fedora 33', 'tag': 'f33-updates'},
+        {'name': 'Fedora 33', 'tag': 'f33'},
+        {'name': 'Fedora 33 Testing', 'tag': 'f33-updates-testing'},
+
 
         {'name': 'Fedora 32', 'tag': 'f32-updates'},
         {'name': 'Fedora 32', 'tag': 'f32'},

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

@@ -11,6 +11,17 @@
       "status": "Under Development",
       "version": "devel"
     },
+    {
+      "allow_retire": false,
+      "branchname": "f33",
+      "date_created": "2014-08-11 12:36:15",
+      "date_updated": "2020-08-11 17:07:23",
+      "dist_tag": ".fc33",
+      "koji_name": "f33",
+      "name": "Fedora",
+      "status": "Under Development",
+      "version": "33"
+    },
     {
       "allow_retire": false,
       "branchname": "f32",

roles/releng/files/branched

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

@@ -1,3 +1,3 @@
 # rawhide compose
 MAILTO=releng-cron@lists.fedoraproject.org
-15 5 * * * root TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && /usr/local/bin/lock-wrapper rawhide-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 5 * * * root TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && /usr/local/bin/lock-wrapper rawhide-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

@@ -160,6 +160,13 @@ handlers = ["console"]
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f34-infra-candidate"
+            to = "f34-infra-stg"
+            key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('45719A39', 'd300e724') }}"
+
+
             # Gated coreos-pool tag
 
             [[consumer_config.koji_instances.primary.tags]]
@@ -186,25 +193,63 @@ handlers = ["console"]
             key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
 
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f34-coreos-signing-pending"
+            to = "coreos-pool"
+            key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('45719A39', 'd300e724') }}"
+
             # Gated rawhide and branched
 
             [[consumer_config.koji_instances.primary.tags]]
-            from = "f33-signing-pending"
-            to = "f33-updates-testing-pending"
-            key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
+            from = "f34-signing-pending"
+            to = "f34-updates-testing-pending"
+            key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('45719A39', 'd300e724') }}"
 
             [consumer_config.koji_instances.primary.tags.sidetags]
-            pattern = 'f33-build-side-<seq_id>'
+            pattern = 'f34-build-side-<seq_id>'
             from = '<sidetag>-signing-pending'
             to = '<sidetag>-testing-pending'
             trusted_taggers = ['bodhi']
 
             [[consumer_config.koji_instances.primary.tags]]
-            from = "f33-pending"
-            to = "f33"
-            key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
+            from = "f34-pending"
+            to = "f34"
+            key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('45719A39', 'd300e724') }}"
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f34-modular-pending"
+            to = "f34-modular"
+            key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('45719A39', 'd300e724') }}"
+            type = "modular"
+
+            [[consumer_config.koji_instances.primary.tags]]
+            from = "f34-modular-updates-candidate"
+            to = "f34-modular"
+            key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('45719A39', 'd300e724') }}"
+            type = "modular"
+
+        #    [[consumer_config.koji_instances.primary.tags]]
+        #    from = "f33-signing-pending"
+        #    to = "f33-updates-testing-pending"
+        #    key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        #    keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
+
+        #    [consumer_config.koji_instances.primary.tags.sidetags]
+        #    pattern = 'f33-build-side-<seq_id>'
+        #    from = '<sidetag>-signing-pending'
+        #    to = '<sidetag>-testing-pending'
+        #    trusted_taggers = ['bodhi']
+
+        #    [[consumer_config.koji_instances.primary.tags]]
+        #    from = "f33-pending"
+        #    to = "f33"
+        #    key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        #    keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f33-modular-pending"
@@ -498,6 +543,35 @@ handlers = ["console"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
 
+        [consumer_config.ostree_refs."fedora/33/x86_64/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/aarch64/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/ppc64le/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/x86_64/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/x86_64/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/aarch64/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/aarch64/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/ppc64le/updates/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+        [consumer_config.ostree_refs."fedora/33/ppc64le/testing/silverblue"]
+        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
+        key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
+
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"

vars/all/FedoraBranched.yaml

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

vars/all/FedoraBranchedBodhi.yaml

@@ -1,2 +1,2 @@
 #options are: prebeta, postbeta, current
-FedoraBranchedBodhi: current 
+FedoraBranchedBodhi: prebeta