master to main change for f33 cloud and container configs

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
Setup for F33 Final 1.2
2021-01-27 09:23:25 -05:00 · 2020-10-19 14:15:21 -04:00 · 2020-10-13 23:29:52 -04:00 · 2020-10-09 11:19:14 -04:00 · 2020-10-06 19:01:03 +02:00 · 2020-09-25 15:38:52 -04:00
7 changed files with 1797 additions and 79 deletions
--- a/fedora-beta.conf
+++ b/fedora-beta.conf
@ -0,0 +1,840 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '33'
+
+# GENERAL SETTINGS
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f33.xml',
+    'command': 'make comps-f33.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f33',
+    'dir': '.'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['9570FF31']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'ppc64le', 's390x', 'x86_64']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot_method = 'koji'
+runroot_channel = 'compose'
+runroot_tag = 'f33-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f33-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
+gather_backend = 'dnf'
+gather_profiler = True
+check_deps = False
+greedy_method = 'build'
+
+repoclosure_backend = 'dnf'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_deltas = False
+createrepo_database = True
+createrepo_use_xz = True
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
+createrepo_num_workers = 10
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s_%(label)s-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# CREATEISO
+iso_hfs_ppc64le_compatible = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+buildinstall_skip = [
+    ('^Modular$', {
+        '*': True
+    }),
+    ('^Everything$', {
+        'i386': True
+    }),
+]
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# everywhere.
+# Use 3GB image size for all arches.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     },
+     '*': {
+         'noupgrade': True,
+         'rootfs_size': 3
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('^(Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut.*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ("^.*$", {"*": ["glibc32", "libgcc32"]}),
+    ('(Server)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-11-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'php-devel', 'java-*', 'bash-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
+        'mp'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt',
+        'nvidia-query-resource-opengl-lib',
+        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
+        'glib-networking', 'dssi-vst-wine'
+    ],
+}
+
+createiso_skip = [
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Modular$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s_%(label)s.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
+# '-Workstation-' is a temporary workaround. See
+# https://pagure.io/pungi-fedora/pull-request/525
+volume_id_substitutions = {
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'Silverblue': 'SB',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+           'Comp_Neuro': 'CNr',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
+]
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33'
+global_release = '1.3'
+global_version = '33_Beta'
+# live_images ignores this in favor of live_target
+global_target = 'f33'
+
+image_build = {
+    '^Container$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Base',
+                    'kickstart': 'fedora-container-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-container-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz'), ('vmdk','vmdk')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['ppc64le', 's390x'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+            },
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Scientific-Vagrant',
+                    'kickstart': 'fedora-scientific-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Scientific',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Xfce',
+                    'kickstart': 'fedora-disk-xfce.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 8,
+                    'arches': ['aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Xfce',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Workstation$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Workstation',
+                    'kickstart': 'fedora-disk-workstation.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 11,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Workstation',
+                    'failable': ['armhfp'],
+                     }
+        },
+        ],
+    '^Server$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Server',
+                    'kickstart': 'fedora-disk-server.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 7,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Server',
+                    'install_tree_from': 'Server',
+                    'subvariant': 'Server',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'ppc64le', 'aarch64'],
+                'failable': ['ppc64le', 'aarch64'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Comp_Neuro-Live',
+                'kickstart': 'fedora-live-comp_neuro.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Comp_Neuro'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^Server$', { 
+        '*': ['buildinstall', 'iso'],
+    }),
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f33'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = {
+    "^Silverblue$": {
+        "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+        "force_new_commit": True,
+        "treefile": "fedora-silverblue.yaml",
+        "config_url": "https://pagure.io/workstation-ostree-config.git",
+        "config_branch": "f33",
+        "repo": "Everything",
+        "tag_ref": False,
+        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
+        "ostree_ref": "fedora/33/${basearch}/silverblue",
+        "arches": ["x86_64", "ppc64le", "aarch64"],
+        "failable": ['*'],
+    }
+}
+
+ostree_installer = [
+    ("^Silverblue$", {
+        "x86_64": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-flatpaks.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
+                "ostree_update_repo=https://ostree.fedoraproject.org",
+                "ostree_osname=fedora",
+                "ostree_oskey=fedora-33-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/33/x86_64/silverblue",
+                "ostree_update_ref=fedora/33/x86_64/silverblue",
+                "flatpak_remote_name=fedora",
+                # using registry-no-cdn avoids redirects to the CDN;
+                # needed because of network restrictions on koji runroot
+                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f32 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f33',
+            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
+            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
+            'failable': ['*'],
+        },
+        "ppc64le": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
+                "ostree_update_repo=https://ostree.fedoraproject.org",
+                "ostree_osname=fedora",
+                "ostree_oskey=fedora-33-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/33/ppc64le/silverblue",
+                "ostree_update_ref=fedora/33/ppc64le/silverblue",
+                "flatpak_remote_name=fedora",
+                # using registry-no-cdn avoids redirects to the CDN;
+                # needed because of network restrictions on koji runroot
+                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
+                "flatpak_remote_refs=",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f33',
+            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
+            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
+            'failable': ['*'],
+        },
+        "aarch64": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
+                "ostree_update_repo=https://ostree.fedoraproject.org",
+                "ostree_osname=fedora",
+                "ostree_oskey=fedora-33-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/f33/aarch64/silverblue",
+                "ostree_update_ref=fedora/f33/aarch64/silverblue",
+                "flatpak_remote_name=fedora",
+                # using registry-no-cdn avoids redirects to the CDN;
+                # needed because of network restrictions on koji runroot
+                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
+                "flatpak_remote_refs=",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f33',
+            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
+            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora-Cloud'
 release_short = 'Fedora-Cloud'
-release_version = '29'
+release_version = '33'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@ -9,12 +9,12 @@ bootable = False
 comps_file = {
    'scm': 'git',
    'repo': 'https://pagure.io/fedora-comps.git',
-    'branch': 'master',
-    'file': 'comps-f29.xml',
-    'command': 'make comps-f29.xml'
+    'branch': 'main',
+    'file': 'comps-f33.xml',
+    'command': 'make comps-f33.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['429476B4'] # None = unsigned
+sigkeys = ['9570FF31'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f29-build'
+runroot_tag = 'f33-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f29-updates'
+pkgset_koji_tag = 'f33-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@ -107,7 +107,7 @@ filter_packages = [
        'generic*',
        'GConf2-dbus*',
        'bluez-gnome',
-        'java-1.8.0-openjdk',
+        'java-11-openjdk',
        'community-mysql*',
        'jruby*',
        'gimp-help-*',
@ -118,7 +118,7 @@ filter_packages = [
 multilib_blacklist = {
    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'php-devel', 'java-*',
+        'php-devel', 'java-*', 'bash-devel',
        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
        'mp'
@ -217,19 +217,19 @@ image_build = {
            'image-build': {
                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                    'name': 'Fedora-Cloud-Base',
-                    'target': 'f29',
-                    'version': '29',
+                    'target': 'f33',
+                    'version': '33',
                    'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33',
                    'kickstart': 'fedora-cloud-base.ks',
                    'distro': 'Fedora-22',
                    'disk_size': 4,
                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
                    'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' 
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/' 
                    ],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/',
                    'subvariant': 'Cloud_Base'
                     }
        },
@ -237,19 +237,19 @@ image_build = {
            'image-build': {
                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                    'name': 'Fedora-Cloud-Base-Vagrant',
-                    'target': 'f29',
-                    'version': '29',
+                    'target': 'f33',
+                    'version': '33',
                    'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33',
                    'kickstart': 'fedora-cloud-base-vagrant.ks',
                    'distro': 'Fedora-22',
                    'disk_size': 40,
                    'arches': ['x86_64'],
                    'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' 
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/' 
                    ],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/',
                    'subvariant': 'Cloud_Base',
                     }
        },
--- a/fedora-container.conf
+++ b/fedora-container.conf
@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora-Container'
 release_short = 'Fedora-Container'
-release_version = '29'
+release_version = '33'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@ -9,12 +9,12 @@ bootable = False
 comps_file = {
    'scm': 'git',
    'repo': 'https://pagure.io/fedora-comps.git',
-    'branch': 'master',
-    'file': 'comps-f29.xml',
-    'command': 'make comps-f29.xml'
+    'branch': 'main',
+    'file': 'comps-f33.xml',
+    'command': 'make comps-f33.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['429476B4'] # None = unsigned
+sigkeys = ['9570FF31'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f29-build'
+runroot_tag = 'f33-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f29-updates'
+pkgset_koji_tag = 'f33-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@ -107,7 +107,7 @@ filter_packages = [
        'generic*',
        'GConf2-dbus*',
        'bluez-gnome',
-        'java-1.8.0-openjdk',
+        'java-11-openjdk',
        'community-mysql*',
        'jruby*',
        'gimp-help-*',
@ -118,7 +118,7 @@ filter_packages = [
 multilib_blacklist = {
    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'php-devel', 'java-*',
+        'php-devel', 'java-*', 'bash-devel',
        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
        'mp'
@ -132,7 +132,7 @@ multilib_whitelist = {
        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
-        'mariadb-connector-odbc', 'compiler-rt'.
+        'mariadb-connector-odbc', 'compiler-rt',
        'nvidia-query-resource-opengl-lib',
        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
        'glib-networking', 'dssi-vst-wine'
@ -213,10 +213,10 @@ translate_paths = [
 ]

 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = '29'
-global_target = 'f29'
+global_version = '33'
+global_target = 'f33'

 image_build = {
    '^Container$': [
@ -228,18 +228,18 @@ image_build = {
                    'distro': 'Fedora-22',
                    'disk_size': 5,
                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/',
                    'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/'
                    ],
                    'subvariant': 'Container_Base'
                    },
            'factory-parameters': {
                'dockerversion': "1.10.1",
                'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
+                'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
            },
        },
        {
@ -250,18 +250,18 @@ image_build = {
                    'distro': 'Fedora-22',
                    'disk_size': 5,
                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/',
                    'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/33/latest-Fedora-33/compose/Everything/$arch/os/'
                    ],
                    'subvariant': 'Container_Minimal_Base',
                    },
            'factory-parameters': {
                'dockerversion': "1.10.1",
                'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
+                'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
            },
        }
        ],
--- a/fedora-final.conf
+++ b/fedora-final.conf
@ -0,0 +1,859 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '33'
+
+# GENERAL SETTINGS
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f33.xml',
+    'command': 'make comps-f33.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f33',
+    'dir': '.'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['9570FF31']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'ppc64le', 's390x', 'x86_64']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot_method = 'koji'
+runroot_channel = 'compose'
+runroot_tag = 'f33-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f33-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
+gather_backend = 'dnf'
+gather_profiler = True
+check_deps = False
+greedy_method = 'build'
+
+repoclosure_backend = 'dnf'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_deltas = False
+createrepo_database = True
+createrepo_use_xz = True
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
+createrepo_num_workers = 10
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.2-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# CREATEISO
+iso_hfs_ppc64le_compatible = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+buildinstall_skip = [
+    ('^Modular$', {
+        '*': True
+    }),
+    ('^Everything$', {
+        'i386': True
+    }),
+]
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# everywhere.
+# Use 3GB image size for all arches.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     },
+     '*': {
+         'noupgrade': True,
+         'rootfs_size': 3
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('^(Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut.*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ("^.*$", {"*": ["glibc32", "libgcc32"]}),
+    ('(Server)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-11-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'php-devel', 'java-*', 'bash-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
+        'mp'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt',
+        'nvidia-query-resource-opengl-lib',
+        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
+        'glib-networking', 'dssi-vst-wine'
+    ],
+}
+
+createiso_skip = [
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Modular$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.2.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
+# '-Workstation-' is a temporary workaround. See
+# https://pagure.io/pungi-fedora/pull-request/525
+volume_id_substitutions = {
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'Silverblue': 'SB',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+           'Comp_Neuro': 'CNr',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
+]
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33'
+global_release = '1.2'
+global_version = '33'
+# live_images ignores this in favor of live_target
+global_target = 'f33'
+
+image_build = {
+    '^Container$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Base',
+                    'kickstart': 'fedora-container-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-container-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['ppc64le', 's390x'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('tar-gz', 'tar.gz')],
+                    'name': 'Fedora-Cloud-Base-GCP',
+                    'kickstart': 'fedora-cloud-base-gcp.ks',
+                    # Use `Fedora-30` profile here because we need it
+                    # to be a UEFI image and currently OZ does that if
+                    # we use the `Fedora-30` profile.
+                    'distro': 'Fedora-30',
+                    # GCP engineers have told me the disk images have bad
+                    # performance if they are anything less than 10G
+                    'disk_size': 10,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['x86_64'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+            },
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Scientific-Vagrant',
+                    'kickstart': 'fedora-scientific-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Scientific',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Xfce',
+                    'kickstart': 'fedora-disk-xfce.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 8,
+                    'arches': ['aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Xfce',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Workstation$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Workstation',
+                    'kickstart': 'fedora-disk-workstation.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 11,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Workstation',
+                    'failable': ['armhfp'],
+                     }
+        },
+        ],
+    '^Server$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Server',
+                    'kickstart': 'fedora-disk-server.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 7,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Server',
+                    'install_tree_from': 'Server',
+                    'subvariant': 'Server',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'ppc64le', 'aarch64'],
+                'failable': ['ppc64le', 'aarch64'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Comp_Neuro-Live',
+                'kickstart': 'fedora-live-comp_neuro.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Comp_Neuro'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^Server$', { 
+        '*': ['buildinstall', 'iso'],
+    }),
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f33'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = {
+    "^Silverblue$": {
+        "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+        "force_new_commit": True,
+        "treefile": "fedora-silverblue.yaml",
+        "config_url": "https://pagure.io/workstation-ostree-config.git",
+        "config_branch": "f33",
+        "repo": "Everything",
+        "tag_ref": False,
+        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
+        "ostree_ref": "fedora/33/${basearch}/silverblue",
+        "arches": ["x86_64", "ppc64le", "aarch64"],
+        "failable": ['*'],
+    }
+}
+
+ostree_installer = [
+    ("^Silverblue$", {
+        "x86_64": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-flatpaks.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
+                "ostree_update_repo=https://ostree.fedoraproject.org",
+                "ostree_osname=fedora",
+                "ostree_oskey=fedora-33-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/33/x86_64/silverblue",
+                "ostree_update_ref=fedora/33/x86_64/silverblue",
+                "flatpak_remote_name=fedora",
+                # using registry-no-cdn avoids redirects to the CDN;
+                # needed because of network restrictions on koji runroot
+                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f33 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f33',
+            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
+            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
+            'failable': ['*'],
+        },
+        "ppc64le": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
+                "ostree_update_repo=https://ostree.fedoraproject.org",
+                "ostree_osname=fedora",
+                "ostree_oskey=fedora-33-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/33/ppc64le/silverblue",
+                "ostree_update_ref=fedora/33/ppc64le/silverblue",
+                "flatpak_remote_name=fedora",
+                # using registry-no-cdn avoids redirects to the CDN;
+                # needed because of network restrictions on koji runroot
+                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
+                "flatpak_remote_refs=",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f33',
+            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
+            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
+            'failable': ['*'],
+        },
+        "aarch64": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
+                "ostree_update_repo=https://ostree.fedoraproject.org",
+                "ostree_osname=fedora",
+                "ostree_oskey=fedora-33-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/33/aarch64/silverblue",
+                "ostree_update_ref=fedora/33/aarch64/silverblue",
+                "flatpak_remote_name=fedora",
+                # using registry-no-cdn avoids redirects to the CDN;
+                # needed because of network restrictions on koji runroot
+                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
+                "flatpak_remote_refs=",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f33',
+            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
+            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'
--- a/fedora.conf
+++ b/fedora.conf
@ -1,20 +1,20 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '33'

 # GENERAL SETTINGS
 comps_file = {
    'scm': 'git',
    'repo': 'https://pagure.io/fedora-comps.git',
    'branch': 'master',
-    'file': 'comps-rawhide.xml',
-    'command': 'make comps-rawhide.xml'
+    'file': 'comps-f33.xml',
+    'command': 'make comps-f33.xml'
 }
 module_defaults_dir = {
    'scm': 'git',
    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'master',
+    'branch': 'f33',
    'dir': '.'
 }

@ -75,7 +75,7 @@ repoclosure_backend = 'dnf'
 createrepo_deltas = False
 createrepo_database = True
 createrepo_use_xz = True
-createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
 createrepo_num_workers = 10

 # CHECKSUMS
@ -290,9 +290,9 @@ translate_paths = [
 ]

 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f33'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Rawhide'
+global_version = '33'
 # live_images ignores this in favor of live_target
 global_target = 'f33'

@ -342,7 +342,7 @@ image_build = {
    '^Cloud$': [
        {
            'image-build': {
-                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz'), ('vmdk','vmdk')],
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                    'name': 'Fedora-Cloud-Base',
                    'kickstart': 'fedora-cloud-base.ks',
                    'distro': 'Fedora-22',
@ -354,6 +354,25 @@ image_build = {
                    'failable': ['ppc64le', 's390x'],
                     }
        },
+        {
+            'image-build': {
+                    'format': [('tar-gz', 'tar.gz')],
+                    'name': 'Fedora-Cloud-Base-GCP',
+                    'kickstart': 'fedora-cloud-base-gcp.ks',
+                    # Use `Fedora-30` profile here because we need it
+                    # to be a UEFI image and currently OZ does that if
+                    # we use the `Fedora-30` profile.
+                    'distro': 'Fedora-30',
+                    # GCP engineers have told me the disk images have bad
+                    # performance if they are anything less than 10G
+                    'disk_size': 10,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['x86_64'],
+                     }
+        },
        {
            'image-build': {
                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
@ -743,11 +762,11 @@ ostree = {
        "force_new_commit": True,
        "treefile": "fedora-silverblue.yaml",
        "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "master",
+        "config_branch": "f33",
        "repo": "Everything",
        "tag_ref": False,
        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
+        "ostree_ref": "fedora/33/${basearch}/silverblue",
        "arches": ["x86_64", "ppc64le", "aarch64"],
        "failable": ['*'],
    }
@ -768,16 +787,16 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-33-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/silverblue",
-                "ostree_update_ref=fedora/rawhide/x86_64/silverblue",
+                "ostree_install_ref=fedora/33/x86_64/silverblue",
+                "ostree_update_ref=fedora/33/x86_64/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f32 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f33 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f33',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -794,8 +813,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-33-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
-                "ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
+                "ostree_install_ref=fedora/33/ppc64le/silverblue",
+                "ostree_update_ref=fedora/33/ppc64le/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -803,7 +822,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f33',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -820,8 +839,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-33-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/aarch64/silverblue",
-                "ostree_update_ref=fedora/rawhide/aarch64/silverblue",
+                "ostree_install_ref=fedora/33/aarch64/silverblue",
+                "ostree_update_ref=fedora/33/aarch64/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -829,7 +848,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f33',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
--- a/nightly.sh
+++ b/nightly.sh
@ -4,16 +4,16 @@
 export LC_ALL=C

 CONFIG="fedora.conf"
-TARGET_DIR="/mnt/koji/compose/rawhide"
+TARGET_DIR="/mnt/koji/compose/branched"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 SHORT="Fedora"
-RELEASE="rawhide"
-RELEASE_TITLE="Rawhide"
-COMPSFILE="comps-rawhide.xml"
+RELEASE="33"
+RELEASE_TITLE="33"
+COMPSFILE="comps-f33.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
@ -111,7 +111,7 @@ fi
 ./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/"  --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"

 [ -z "$ARCH" ] && {
-./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
+./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
 }

 # Tell interested persons that the rsync is starting (zomg!)
@ -131,16 +131,16 @@ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
    --variant Everything --variant Cloud --variant Container \
    --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
    --link-dest="$RSYNCTARGET/Everything" --delete-after
-# aarch64 for Everything Server Cloud Container is primary
+# aarch64 for Everything Server Cloud Container Workstation is primary
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
    "$DESTDIR" "$RSYNCTARGET/" \
    --variant Everything --variant Server --variant Cloud --variant Container \
-    --variant Modular \
+    --variant Modular --variant Workstation \
    --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
    "$DESTDIR" "$RSYNCTARGET/" \
    --variant Everything --variant Server --variant Cloud --variant Container \
-    --variant Modular \
+    --variant Modular --variant Workstation \
    --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@ -174,14 +174,14 @@ $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
    --variant Everything --variant Cloud --variant Container \
    --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
    --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
-# aarch64 is alternative for Labs Spins Workstation
+# aarch64 is alternative for Labs Spins
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Labs --variant Spins --variant Workstation \
+    --variant Labs --variant Spins \
    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Labs --variant Spins --variant Workstation \
+    --variant Labs --variant Spins \
    --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
@ -192,7 +192,7 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC
 old_umask=$(umask)
 umask 0002
 for arch in x86_64 ppc64le aarch64; do
-    ref="fedora/rawhide/${arch}/silverblue"
+    ref="fedora/33/${arch}/silverblue"
    if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi

    ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
--- a/release-candidate.sh
+++ b/release-candidate.sh
@ -5,13 +5,13 @@ LABEL=$1
 # to the script are passed to pungi-koji directly.
 shift
 CONFIG="fedora-final.conf"
-TARGET_DIR="/mnt/koji/compose/26"
+TARGET_DIR="/mnt/koji/compose/33"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
 SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
-COMPSFILE="comps-f26.xml"
+COMPSFILE="comps-f33.xml"
 TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
@ -23,7 +23,7 @@ git clone https://pagure.io/fedora-comps.git && {
    popd
 }
 popd
-CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
+CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
 if [ -z "$COMPOSE_ID" ]; then
    CMD="$CMD --target-dir=$TARGET_DIR"
 else
Author	SHA1	Message	Date
Mohan Boddu	cd40c56c38	master to main change for f33 cloud and container configs Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2021-01-27 09:23:25 -05:00
Mohan Boddu	653e25833c	Setup for F33 Final 1.2 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2020-10-19 14:15:21 -04:00
Mohan Boddu	39a560c65f	Setup for F33 Final 1.1 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2020-10-13 23:29:52 -04:00
Dusty Mabe	6b17da0545	Fix the ref for aarch64 SB ostree installer right: fedora/33/aarch64/silverblue wrong: fedora/f33/aarch64/silverblue Signed-off-by: Dusty Mabe <dusty@dustymabe.com>	2020-10-09 11:19:14 -04:00
Kalev Lember	354005b5b9	Switch to F33 flatpak runtime for Silverblue All preinstalled flatpak apps are rebuilt and based on the F33 flatpak runtime now. Signed-off-by: Kalev Lember <klember@redhat.com>	2020-10-06 19:01:03 +02:00
Dusty Mabe	a731857059	cloud: switch imagebuild for GCP image to tar-gz format It turns out koji doesn't know about `gce` even though ImageFactory does. Really all we need is the output disk image to be a tar.gz so let's try with the `tar-gz` format in koji, which looks like it was intended for use with GCP. Signed-off-by: Dusty Mabe <dusty@dustymabe.com> (cherry picked from commit `4a664ab4f9`)	2020-09-25 15:38:52 -04:00
Dusty Mabe	0f720c51ca	cloud: drop VMDK output image for cloud We added this so we could eventually use the VMDK to optimize our uploads to AWS but it turns out the VMDK created by imagefactory isn't in the right format anyway. ``` SNAPSHOTTASKDETAIL 0.0 VMDK deleted ClientError: Disk validation failed [Unsupported VMDK File Format] ``` Let's drop them for now. Signed-off-by: Dusty Mabe <dusty@dustymabe.com> (cherry picked from commit `b4b0781b78`)	2020-09-25 15:38:52 -04:00
Dusty Mabe	b2ff2c490d	cloud: add image build for GCP Depends on the kickstart for GCP getting merged: https://pagure.io/fedora-kickstarts/pull-request/690# Signed-off-by: Dusty Mabe <dusty@dustymabe.com> (cherry picked from commit `783f489ad7`)	2020-09-25 15:38:52 -04:00
Mohan Boddu	383eb348f1	Setup for f33 Beta 1.3 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2020-09-22 10:03:33 -04:00
Mohan Boddu	555b05603b	Setup for F33 Beta 1.2 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2020-09-21 21:45:33 -04:00
Mohan Boddu	1a9598b408	Setup for F33 Beta 1.1 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2020-09-14 10:30:22 -04:00
Paul Whalen	463059e57c	Move aarch64 workstation rsync to primary, remove from alt. Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>	2020-08-31 14:33:38 -04:00
Mohan Boddu	6269bde56b	Fixing kickstarts repo url Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2020-08-12 17:18:46 -04:00
Tomas Hrcka	c80e8a7e82	Branching F33 from rawhide Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2020-08-11 15:01:25 +02:00