Temporarily drop armhfp here so we can push out updates for other arches

armhfp is failing container updates for ages. See https://bugzilla.redhat.com/show_bug.cgi?id=2077680 Since we have been unable to fix that, lets drop armhfp for a bit until we can fix it. Sorry arm users. Signed-off-by: Kevin Fenzi <kevin@scrye.com>
Ensure Fedora Cloud images get built in a legacy (BIOS) boot environment
2022-05-23 16:21:34 -07:00 · 2021-06-22 17:21:57 -04:00 · 2021-05-04 08:44:16 -07:00 · 2021-05-02 10:16:31 -07:00 · 2021-05-02 10:11:18 -07:00 · 2021-04-22 17:12:22 -07:00
9 changed files with 1793 additions and 206 deletions
--- a/cloud-nightly.sh
+++ b/cloud-nightly.sh
@ -13,9 +13,9 @@ DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Cloud"
-RELEASE="29"
-RELEASE_TITLE="29"
-COMPSFILE="comps-f29.xml"
+RELEASE="34"
+RELEASE_TITLE="34"
+COMPSFILE="comps-f34.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
--- a/container-nightly.sh
+++ b/container-nightly.sh
@ -12,9 +12,9 @@ DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Docker"
-RELEASE="29"
-RELEASE_TITLE="29"
-COMPSFILE="comps-f29.xml"
+RELEASE="34"
+RELEASE_TITLE="34"
+COMPSFILE="comps-f34.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
--- a/fedora-beta.conf
+++ b/fedora-beta.conf
@ -0,0 +1,829 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '34'
+
+# GENERAL SETTINGS
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'main',
+    'file': 'comps-f34.xml',
+    'command': 'make comps-f34.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f34',
+    'dir': '.'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['45719A39']
+
+# 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 = 'f34-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f34-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,
+         'squashfs_only': True
+     },
+     '*': {
+         'noupgrade': True,
+         'rootfs_size': 3,
+         'squashfs_only': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('^(Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut.*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'glibc-langpack-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'langpacks-*',
+            'man-pages-*',
+            'mythes-*',
+            'python3.*-debuginfo',
+        ],
+    }),
+
+    ('^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-*',
+        ]
+    }),
+]
+
+filter_modules = [
+    ('(Modular)$', {
+        '*': [
+        'perl-bootstrap:*',
+        'rpm:*',
+        ]
+    }),
+]
+
+# 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', 'mangohud', 'vkBasalt', 'glx-utils'
+    ],
+}
+
+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/f34'
+global_release = '1.3'
+global_version = '34_Beta'
+# live_images ignores this in favor of live_target
+global_target = 'f34'
+
+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=f34container", "FGC=f34", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
+            },
+        },
+        {
+            '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=f34container", "FGC=f34", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    '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': ['*'],
+            },
+        },
+        {
+            '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'],
+                     }
+        },
+        ],
+    '^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'
+            }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Python-Classroom',
+                    'kickstart': 'fedora-disk-python-classroom.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 10,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+            }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 6,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-KDE',
+                    'kickstart': 'fedora-disk-kde.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 11,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'KDE',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-SoaS',
+                    'kickstart': 'fedora-disk-soas.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 6,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'SoaS',
+                    'failable': ['*'],
+                    }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Xfce',
+                    'kickstart': 'fedora-disk-xfce.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 11,
+                    'arches': ['aarch64', 'armhfp'],
+                    '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-30',
+                    '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-30',
+                    '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', 'aarch64'],
+                'failable': ['aarch64'],
+                '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'
+            }
+            {
+                'name': 'Fedora-i3-Live',
+                'kickstart': 'fedora-live-i3.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'i3'
+            }
+        ],
+    '^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 = [
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+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": "f34",
+        "repo": "Everything",
+        "tag_ref": False,
+        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
+        "ostree_ref": "fedora/34/${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-34-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/34/x86_64/silverblue",
+                "ostree_update_ref=fedora/34/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': 'f34',
+            # 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-34-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/34/ppc64le/silverblue",
+                "ostree_update_ref=fedora/34/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': 'f34',
+            # 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-34-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/34/aarch64/silverblue",
+                "ostree_update_ref=fedora/34/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': 'f34',
+            # 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 = '34'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@ -9,9 +9,9 @@ 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-f34.xml',
+    'command': 'make comps-f34.xml'
 }
 variants_file='variants-fedora.xml'
 sigkeys = ['429476B4'] # None = unsigned
@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f29-build'
+runroot_tag = 'f34-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f29-updates'
+pkgset_koji_tag = 'f34-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@ -217,19 +217,19 @@ image_build = {
            'image-build': {
                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                    'name': 'Fedora-Cloud-Base',
-                    'target': 'f29',
-                    'version': '29',
+                    'target': 'f34',
+                    'version': '34',
                    'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f34',
                    '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/f34-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/34/latest-Fedora-34/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/34/latest-Fedora-34/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': 'f34',
+                    'version': '34',
                    'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f34',
                    '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/f34-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/34/latest-Fedora-34/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/34/latest-Fedora-34/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 = '34'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@ -9,15 +9,15 @@ 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-f34.xml',
+    'command': 'make comps-f34.xml'
 }
 variants_file='variants-fedora.xml'
 sigkeys = ['429476B4'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
+tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
 tree_variants = ['Container']
@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f29-build'
+runroot_tag = 'f34-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f29-updates'
+pkgset_koji_tag = 'f34-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@ -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', 'mangohud', 'vkBasalt'
@ -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/f34'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = '29'
-global_target = 'f29'
+global_version = '34'
+global_target = 'f34'

 image_build = {
    '^Container$': [
@ -227,19 +227,19 @@ image_build = {
                    'kickstart': 'fedora-container-base.ks',
                    '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/',
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/34/latest-Fedora-34/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/f34-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/34/latest-Fedora-34/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=f34container", "FGC=f34", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
            },
        },
        {
@ -249,19 +249,19 @@ image_build = {
                    'kickstart': 'fedora-container-base-minimal.ks',
                    '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/',
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/34/latest-Fedora-34/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/f34-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/34/latest-Fedora-34/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=f34container", "FGC=f34", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
            },
        }
        ],
--- a/fedora-final.conf
+++ b/fedora-final.conf
@ -0,0 +1,829 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '34'
+
+# GENERAL SETTINGS
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'main',
+    'file': 'comps-f34.xml',
+    'command': 'make comps-f34.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f34',
+    'dir': '.'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['45719A39']
+
+# 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 = 'f34-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f34-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,
+         'squashfs_only': True
+     },
+     '*': {
+         'noupgrade': True,
+         'rootfs_size': 3,
+         'squashfs_only': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('^(Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut.*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'glibc-langpack-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'langpacks-*',
+            'man-pages-*',
+            'mythes-*',
+            'python3.*-debuginfo',
+        ],
+    }),
+
+    ('^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-*',
+        ]
+    }),
+]
+
+filter_modules = [
+    ('(Modular)$', {
+        '*': [
+        'perl-bootstrap:*',
+        'rpm:*',
+        ]
+    }),
+]
+
+# 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', 'mangohud', 'vkBasalt', 'glx-utils'
+    ],
+}
+
+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/f34'
+global_release = '1.2'
+global_version = '34'
+# live_images ignores this in favor of live_target
+global_target = 'f34'
+
+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=f34container", "FGC=f34", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
+            },
+        },
+        {
+            '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=f34container", "FGC=f34", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    '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'
+            }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Python-Classroom',
+                    'kickstart': 'fedora-disk-python-classroom.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 10,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 6,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-KDE',
+                    'kickstart': 'fedora-disk-kde.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 11,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'KDE',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-SoaS',
+                    'kickstart': 'fedora-disk-soas.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 6,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'SoaS',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Xfce',
+                    'kickstart': 'fedora-disk-xfce.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 11,
+                    'arches': ['aarch64', 'armhfp'],
+                    '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-30',
+                    '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-30',
+                    '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', 'aarch64'],
+                'failable': ['aarch64'],
+                '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'
+            }
+            {
+                'name': 'Fedora-i3-Live',
+                'kickstart': 'fedora-live-i3.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'i3'
+            }
+        ],
+    '^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 = [
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+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": "f34",
+        "repo": "Everything",
+        "tag_ref": False,
+        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
+        "ostree_ref": "fedora/34/${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-34-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/34/x86_64/silverblue",
+                "ostree_update_ref=fedora/34/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/f34 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': 'f34',
+            # 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-34-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/34/ppc64le/silverblue",
+                "ostree_update_ref=fedora/34/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': 'f34',
+            # 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-34-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/34/aarch64/silverblue",
+                "ostree_update_ref=fedora/34/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': 'f34',
+            # 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 = '34'

 # GENERAL SETTINGS
 comps_file = {
    'scm': 'git',
    'repo': 'https://pagure.io/fedora-comps.git',
    'branch': 'main',
-    'file': 'comps-rawhide.xml',
-    'command': 'make comps-rawhide.xml'
+    'file': 'comps-f34.xml',
+    'command': 'make comps-f34.xml'
 }
 module_defaults_dir = {
    'scm': 'git',
    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'main',
+    'branch': 'f34',
    '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
@ -302,9 +302,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/f34'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Rawhide'
+global_version = '34'
 # live_images ignores this in favor of live_target
 global_target = 'f34'

@ -435,6 +435,20 @@ image_build = {
                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
            }
        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Python-Classroom',
+                    'kickstart': 'fedora-disk-python-classroom.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 10,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     }
+        },
        ],
    '^Spins': [
        {
@ -442,9 +456,9 @@ image_build = {
                    'format': [('raw-xz','raw.xz')],
                    'name': 'Fedora-Minimal',
                    'kickstart': 'fedora-disk-minimal.ks',
-                    'distro': 'Fedora-22',
+                    'distro': 'Fedora-30',
                    'disk_size': 6,
-                    'arches': ['armhfp', 'aarch64'],
+                    'arches': ['aarch64', 'armhfp'],
                    'repo': 'Everything',
                    'install_tree_from': 'Everything',
                    'subvariant': 'Minimal',
@ -456,23 +470,37 @@ image_build = {
                    'format': [('raw-xz','raw.xz')],
                    'name': 'Fedora-KDE',
                    'kickstart': 'fedora-disk-kde.ks',
-                    'distro': 'Fedora-22',
+                    'distro': 'Fedora-30',
                    'disk_size': 11,
-                    'arches': ['armhfp', 'aarch64'],
+                    'arches': ['aarch64', 'armhfp'],
                    'repo': 'Everything',
                    'install_tree_from': 'Everything',
                    'subvariant': 'KDE',
                    'failable': ['*'],
                     }
        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-SoaS',
+                    'kickstart': 'fedora-disk-soas.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 6,
+                    'arches': ['aarch64', 'armhfp'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'SoaS',
+                    'failable': ['*'],
+                     }
+        },
        {
            'image-build': {
                    'format': [('raw-xz','raw.xz')],
                    'name': 'Fedora-Xfce',
                    'kickstart': 'fedora-disk-xfce.ks',
-                    'distro': 'Fedora-22',
-                    'disk_size': 9,
-                    'arches': ['aarch64'],
+                    'distro': 'Fedora-30',
+                    'disk_size': 11,
+                    'arches': ['aarch64', 'armhfp'],
                    'repo': 'Everything',
                    'install_tree_from': 'Everything',
                    'subvariant': 'Xfce',
@ -486,7 +514,7 @@ image_build = {
                    'format': [('raw-xz','raw.xz')],
                    'name': 'Fedora-Workstation',
                    'kickstart': 'fedora-disk-workstation.ks',
-                    'distro': 'Fedora-22',
+                    'distro': 'Fedora-30',
                    'disk_size': 11,
                    'arches': ['armhfp', 'aarch64'],
                    'repo': 'Everything',
@ -502,7 +530,7 @@ image_build = {
                    'format': [('raw-xz','raw.xz')],
                    'name': 'Fedora-Server',
                    'kickstart': 'fedora-disk-server.ks',
-                    'distro': 'Fedora-22',
+                    'distro': 'Fedora-30',
                    'disk_size': 7,
                    'arches': ['armhfp', 'aarch64'],
                    'repo': 'Server',
@ -592,6 +620,15 @@ live_media = {
                'install_tree_from': 'Everything',
                'subvariant': 'LXQt'
            }
+            {
+                'name': 'Fedora-i3-Live',
+                'kickstart': 'fedora-live-i3.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'i3'
+            }
        ],
    '^Labs$': [
            {
@ -689,110 +726,17 @@ failable_deliverables = [
    })
 ]

-live_target = 'f34'
-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,
-                'subvariant': 'Workstation_Appliance',
-                }
-    }),
-    ('^Server$', {
-        'armhfp': {
-                'kickstart': 'fedora-arm-server.ks',
-                'name': 'Fedora-Server-armhfp',
-                'type': 'appliance',
-                'failable': True,
-                'subvariant': 'Server_Appliance',
-                }
-    }),
-    ('^Spins$', {
-        'armhfp': [{
-                'kickstart': 'fedora-arm-kde.ks',
-                'name': 'Fedora-KDE-armhfp',
-                'repo': 'Everything',
-                'type': 'appliance',
-                'subvariant': 'KDE_Appliance',
-                '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_Appliance',
-                '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_Appliance',
-                '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": "main",
+        "config_branch": "f34",
        "repo": "Everything",
        "tag_ref": False,
        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
+        "ostree_ref": "fedora/34/${basearch}/silverblue",
        "arches": ["x86_64", "ppc64le", "aarch64"],
        "failable": ['*'],
    }
@ -813,16 +757,16 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-34-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/34/x86_64/silverblue",
+                "ostree_update_ref=fedora/34/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",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f34 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': 'main',
+            'template_branch': 'f34',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -839,8 +783,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-34-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/34/ppc64le/silverblue",
+                "ostree_update_ref=fedora/34/ppc64le/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -848,7 +792,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f34',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -865,8 +809,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-34-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/34/aarch64/silverblue",
+                "ostree_update_ref=fedora/34/aarch64/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -874,7 +818,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f34',
            # 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="34"
+RELEASE_TITLE="34"
+COMPSFILE="comps-34.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!)
@ -121,27 +121,18 @@ send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
 if [ ! -d "$RSYNCTARGET" ]; then
  mkdir "$RSYNCTARGET"
 fi
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
+# armhfp/aarch64/x86_64 for Everything Cloud Container Modular Server Workstation is primary
+$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \
    "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Cloud --variant Container \
-    --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
+    --variant Everything --variant Cloud --variant Container --variant Modular \
+    --variant Server --variant Spins --variant Silverblue --variant Workstation \
    --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
+$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \
    "$DESTDIR" "$RSYNCTARGET/" \
-    --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 Workstation is primary
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
-    "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant Cloud --variant Container \
-    --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 Workstation \
+    --variant Everything --variant Cloud --variant Container --variant Modular \
+    --variant Server --variant Spins --variant Silverblue --variant Workstation \
    --link-dest="$RSYNCTARGET/Everything" --delete-after
+
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"

@ -152,11 +143,12 @@ time hardlink -v "$RSYNCTARGET/.."
 if [ ! -d "$RSYNCALTTARGET" ]; then
  mkdir "$RSYNCALTTARGET"
 fi
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
+# labs artefacts are alternative
+$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 \
    "$DESTDIR" "$RSYNCALTTARGET/" \
    --variant Labs \
    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
+$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 \
    "$DESTDIR" "$RSYNCALTTARGET/" \
    --variant Labs \
    --link-dest="$RSYNCTARGET/Everything/" --delete-after
@ -170,6 +162,7 @@ time hardlink -v "$RSYNCTARGET/.."
 if [ ! -d "$RSYNCSECTARGET" ]; then
  mkdir "$RSYNCSECTARGET"
 fi
+# all ppc64le/s390x artefacts are secondary
 $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
    "$DESTDIR" "$RSYNCSECTARGET/" \
    --variant Everything --variant Cloud --variant Container \
@ -180,20 +173,12 @@ $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
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
-    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Labs --variant Spins \
-    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
-    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Labs --variant Spins \
-    --link-dest="$RSYNCTARGET/Everything/" --delete-after
+
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"

 # hardlink content (this will hardlink aarch64 with the other arches)
-time hardlink -v "$RSYNCTARGET/.."
+time hardlink -v "$RSYNCSECTARGET/.."

 # sync Silverblue to the unified ostree repo
 # Set the umask to so directories can get group write
@ -201,7 +186,7 @@ time hardlink -v "$RSYNCTARGET/.."
 old_umask=$(umask)
 umask 0002
 for arch in x86_64 ppc64le aarch64; do
-    ref="fedora/rawhide/${arch}/silverblue"
+    ref="fedora/34/${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/34"
 #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-f34.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
Kevin Fenzi	6cb0600642	Temporarily drop armhfp here so we can push out updates for other arches armhfp is failing container updates for ages. See https://bugzilla.redhat.com/show_bug.cgi?id=2077680 Since we have been unable to fix that, lets drop armhfp for a bit until we can fix it. Sorry arm users. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2022-05-23 16:21:34 -07:00
Neal Gompa	68eaabaa74	Ensure Fedora Cloud images get built in a legacy (BIOS) boot environment The "Fedora-22" distro type configures the environment to use legacy (BIOS) boot to setup the VM to build the image. This is required to ensure cloud images are properly bootable. Fixes: https://pagure.io/cloud-sig/issue/331 Signed-off-by: Neal Gompa <ngompa13@gmail.com>	2021-06-22 17:21:57 -04:00
Kevin Fenzi	885cc97915	adjust container/cloud updates to use main branch of comps Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-05-04 08:44:16 -07:00
Kevin Fenzi	65739fdb66	f34: cloud and container nightlys fix version Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-05-02 10:16:31 -07:00
Kevin Fenzi	abf5281ee2	f34 container: fix config typo Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-05-02 10:11:18 -07:00
Kevin Fenzi	c14a6e7af6	Prep for f34-rc2 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-04-22 17:12:22 -07:00
Mohan Boddu	e75b9a7c2b	Setup for F34 Final 1.1 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2021-04-20 10:31:05 -04:00
Kalev Lember	aa5c6f94cc	Switch to F34 flatpak runtime for Silverblue All preinstalled flatpak apps are rebuilt and based on the F34 flatpak runtime now. Signed-off-by: Kalev Lember <klember@redhat.com>	2021-03-30 11:41:20 +02:00
Mohan Boddu	78a2363e93	Setup for F34 Beta 1.3 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2021-03-17 16:19:59 -04:00
Kevin Fenzi	82f0a197b6	Revert "Use f34 platform for flatpaks" This reverts commit `4790ce02ea`. There is no f34 platform for flatpaks. We should only change this value when the flatpak maintainers say they have moved to a new stable platform, which will be likely only much closer to real f34 release. flatpaks don't build for bunches of releases, there's only 'stable', so they only build the platform that is stable. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-03-13 09:57:36 -08:00
Mohan Boddu	4790ce02ea	Use f34 platform for flatpaks Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2021-03-13 12:05:11 -05:00
Kevin Fenzi	108f175998	Prepare for f34 Beta RC2 Flatpaks are still using f33 as the platform, there's no f34 one. Change from 1.1 to 1.2 in global_version Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-03-13 16:59:29 +00:00
Kevin Fenzi	bf91afd21a	add space to python-classroom disk image for branched/next beta rc Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-03-11 13:06:29 -08:00
Tomas Hrcka	fde7ec8792	Prepare for f34 Beta 1.1 Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2021-03-09 23:58:00 +01:00
Mohan Boddu	b1e34edb89	Use f34 branch for fedora-lorax-templates Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2021-03-09 16:50:21 -05:00
Kevin Fenzi	f69b49d48d	Fix all variants to delete-after so we dont keep accumulating things. In `57985b0` nightly was updated, but not all the variants were updated in the second sync. The first sync runs with --exclude repodata, then the second one includes that and also does a --delete-after, but we only updated the first one. This should clean up old artifacts. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-03-03 19:46:02 -08:00
Kevin Fenzi	2c18b408f4	nightly.sh: fix secondary hardlink Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-03-01 19:13:15 -08:00
Mohan Boddu	0fe54d33db	Adding i3 spin Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2021-02-23 14:24:50 -05:00
Peter Robinson	e2874458ac	Update the pungi config for the UEFI on ARMv7 changes This update adds the various pieces for the UEFI side of things and removes the old appliance build process including a few cleanups. It also updates the sync process and cleans up a few bits here while at it. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>	2021-02-18 19:31:26 +00:00
Kevin Fenzi	1eccdb5a21	Add missing octothorpe to fedora-kickstarts url Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-02-09 20:37:06 -08:00
Tomas Hrcka	28af67e9fe	Branching F34 from rawhide Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2021-02-09 17:05:32 +01:00