From 471ada460160f54353e6f0743624b298373e9d8a Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Oct 18 2019 21:40:30 +0000
Subject: Setup for F31 Final 1.1


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/fedora-final.conf b/fedora-final.conf
new file mode 100644
index 0000000..bc80996
--- /dev/null
+++ b/fedora-final.conf
@@ -0,0 +1,818 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '31'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f31.xml',
+    'command': 'make comps-f31.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f31',
+    'dir': '.'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['3C3359C4']
+
+# 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 = True
+runroot_channel = 'compose'
+runroot_tag = 'f31-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f31-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]
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(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 ppc64le.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     },
+     'ppc64le': {
+         'rootfs_size': 3
+     },
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('^(Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut.*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ("^.*$", {"*": ["glibc32", "libgcc32"]}),
+    ('(Server)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-11-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'php-devel', 'java-*', 'bash-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# 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'
+    ],
+}
+
+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.1.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',
+         '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/f31'
+global_release = '1.1'
+global_version = '31'
+# live_images ignores this in favor of live_target
+global_target = 'f31'
+
+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=f31container", "FGC=f31", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}',
+            },
+        },
+        {
+            '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=f31container", "FGC=f31", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz'), ('vmdk','vmdk')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['ppc64le', 's390x'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+            },
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Scientific-Vagrant',
+                    'kickstart': 'fedora-scientific-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Scientific',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Xfce',
+                    'kickstart': 'fedora-disk-xfce.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 8,
+                    'arches': ['aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Xfce',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Workstation$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Workstation',
+                    'kickstart': 'fedora-disk-workstation.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 11,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Workstation',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Server$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Server',
+                    'kickstart': 'fedora-disk-server.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 7,
+                    'arches': ['armhfp', 'aarch64'],
+                    'repo': 'Server',
+                    'install_tree_from': 'Server',
+                    'subvariant': 'Server',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', ],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^Server$', { 
+        '*': ['buildinstall', 'iso'],
+    }),
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f31'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': False,
+                },
+                {
+                '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": "f31",
+        "repo": "Everything",
+        "tag_ref": False,
+        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
+        "ostree_ref": "fedora/31/${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"],
+            "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-31-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/31/x86_64/silverblue",
+                "ostree_update_ref=fedora/31/x86_64/silverblue",
+                "flatpak_remote_name=fedora",
+                "flatpak_remote_url=oci+https://registry.fedoraproject.org",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f30 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.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/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': 'f31',
+            '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-31-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/31/ppc64le/silverblue",
+                "ostree_update_ref=fedora/31/ppc64le/silverblue",
+                "flatpak_remote_name=fedora",
+                "flatpak_remote_url=oci+https://registry.fedoraproject.org",
+                "flatpak_remote_refs=",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f31',
+            '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-31-primary",
+                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
+                "ostree_install_ref=fedora/31/aarch64/silverblue",
+                "ostree_update_ref=fedora/31/aarch64/silverblue",
+                "flatpak_remote_name=fedora",
+                "flatpak_remote_url=oci+https://registry.fedoraproject.org",
+                "flatpak_remote_refs=",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f31',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'
diff --git a/release-candidate.sh b/release-candidate.sh
index 304781e..074fb6b 100755
--- a/release-candidate.sh
+++ b/release-candidate.sh
@@ -4,7 +4,7 @@ LABEL=$1
 # Remove the label from arguments. It gets special treatment. Other arguments
 # to the script are passed to pungi-koji directly.
 shift
-CONFIG="fedora-beta.conf"
+CONFIG="fedora-final.conf"
 TARGET_DIR="/mnt/koji/compose/31"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""