From 38df4ad70fbf1ff993a8e64eda172e162f678591 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Apr 09 2024 05:03:03 +0000 Subject: Setup for F40 final rcs Also move flatpaks to f40 (needs to wait for them to be stable) fix release-candidate.sh to point to fedora-final correctly Signed-off-by: Kevin Fenzi --- diff --git a/fedora-final.conf b/fedora-final.conf new file mode 100644 index 0000000..8da1996 --- /dev/null +++ b/fedora-final.conf @@ -0,0 +1,1038 @@ +# Import general configuration from general.conf +from general import * +# Import multilib configuration from multilib.conf +from multilib import * + +# PRODUCT INFO +release_name = 'Fedora' +release_short = 'Fedora' +release_version = '40' + +# GENERAL SETTINGS +comps_file = { + 'scm': 'git', + 'repo': 'https://pagure.io/fedora-comps.git', + 'branch': 'main', + 'file': 'comps-f40.xml', + 'command': 'make comps-f40.xml' +} + +variants_file='variants-fedora.xml' +sigkeys = ['a15B79cc'] + +# limit tree variants +# if undefined, all variants from variants.xml will be included +#tree_variants = ['Server'] + +# RUNROOT settings +runroot_method = 'koji' + +# PKGSET +pkgset_source = 'koji' # koji, repos + +# PKGSET - REPOS +# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]} +# pkgset_repos = {} + +# PKGSET - KOJI +# This should use the 'compose' tag, because thats where we +# tag in things that are not yet stable and have them used by the compose for rc's +pkgset_koji_tag = 'f40-compose' +pkgset_koji_inherit = True + +# GATHER +gather_method = { + '^.*': { # For all variants + 'comps': 'deps', # resolve dependencies for packages from comps file + } +} +gather_backend = 'dnf' +gather_profiler = False + +repoclosure_backend = 'dnf' + +# format: [(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 = ['--general-compress-type', 'gz', '--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/40'] +createrepo_num_workers = 10 + +# CHECKSUMS +media_checksum_base_filename = '%(release_short)s-%(variant)s-%(dirname)s-%(version)s_%(label)s-%(arch)s' + +# CREATEISO +iso_hfs_ppc64le_compatible = False + +# use xorrisofs to make isos +createiso_use_xorrisofs = True + +# BUILDINSTALL +buildinstall_method = 'lorax' +buildinstall_skip = [ + ('^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*', +#] + + +# format: [(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$', { + '*': [ + + ], + }), + +] + +filter_packages = [ + ("^.*$", { + "*": ["glibc32", "libgcc32"], + "s390x": ["rust-std-static-wasm*"], + }), + ('(Server)$', { + '*': [ + 'kernel*debug*', + 'kernel-kdump*', + 'kernel-tools*', + 'syslog-ng*', + 'astronomy-bookmarks', + 'generic*', + 'GConf2-dbus*', + 'bluez-gnome', + 'java-11-openjdk', + 'community-mysql*', + 'jruby*', + 'gimp-help-*', + ] + }), +] + +createiso_skip = [ + ('^Server$', { + 'src': True + }), + + ('^Everything$', { + '*': True, + 'src': True + }), + ] + +# format: [(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' + ] + + +# These will be inherited by live_media, live_images and image_build +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40' +global_release = '1.11' +global_version = '40' +# live_images ignores this in favor of live_target +global_target = 'f40' +# kiwi images need another target that uses old mock chroot +kiwibuild_target = 'f40-kiwi' + + +image_build = { + '^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': 18, + 'arches': ['aarch64'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'Python_Classroom', + 'failable': ['*'], + } + }, + ], + '^Spins': [ + { + 'image-build': { + 'format': [('raw-xz','raw.xz')], + 'name': 'Fedora-KDE', + 'kickstart': 'fedora-disk-kde.ks', + 'distro': 'Fedora-30', + 'disk_size': 18, + 'arches': ['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': 10, + 'arches': ['aarch64'], + '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': 15, + 'arches': ['aarch64'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'Xfce', + 'failable': ['*'], + } + }, + { + 'image-build': { + 'format': [('raw-xz','raw.xz')], + 'name': 'Fedora-Phosh', + 'kickstart': 'fedora-disk-phosh.ks', + 'distro': 'Fedora-30', + 'disk_size': 12, + 'arches': ['aarch64'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'Phosh', + 'failable': ['*'], + } + }, + { + 'image-build': { + 'format': [('raw-xz','raw.xz')], + 'name': 'Fedora-LXQt', + 'kickstart': 'fedora-disk-lxqt.ks', + 'distro': 'Fedora-30', + 'disk_size': 12, + 'arches': ['aarch64'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'LXQt', + 'failable': ['*'], + } + }, + ], + '^Workstation$': [ + { + 'image-build': { + 'format': [('raw-xz','raw.xz')], + 'name': 'Fedora-Workstation', + 'kickstart': 'fedora-disk-workstation.ks', + 'distro': 'Fedora-30', + 'disk_size': '16GB', + 'arches': ['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': ['aarch64'], + 'repo': 'Server', + 'install_tree_from': 'Server', + 'subvariant': 'Server', + 'failable': ['*'], + } + }, + { + 'image-build': { + 'format': [('qcow2','qcow2')], + 'name': 'Fedora-Server-KVM', + 'kickstart': 'fedora-server-vm-full.ks', + 'distro': 'Fedora-22', + 'disk_size': 7, + 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'Server_KVM', + 'failable': ['*'], + } + }, + ], +} + +kiwibuild = { + '^Cloud$': [ + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-Generic', + 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base', + 'failable': ['ppc64le', 's390x'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-AmazonEC2', + 'arches': ['aarch64', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base', + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-Azure', + 'arches': ['aarch64', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base', + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-GCE', + 'arches': ['aarch64', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base', + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-UEFI-UKI', + 'arches': ['aarch64', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base_UKI', + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-Vagrant-libvirt', + 'arches': ['aarch64', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base', + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox', + 'arches': ['x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Cloud_Base', + 'failable': ['*'], + } + ], + '^Container$': [ + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Container-Base-Generic', + 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Container_Base', + 'target': global_target, + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Container-Base-Generic-Minimal', + 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Container_Minimal_Base', + 'target': global_target, + 'failable': ['*'], + }, + { + 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40', + 'description_path': 'Fedora.kiwi', + 'kiwi_profile': 'Container-Toolbox', + 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], + 'repos': ['Everything'], + 'subvariant': 'Container_Toolbox', + 'target': global_target, + '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', 'aarch64'], + 'failable': ['*'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'LXQt' + }, + { + 'name': 'Fedora-Budgie-Live', + 'kickstart': 'fedora-live-budgie.ks', + 'arches': ['x86_64'], + 'failable': ['*'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'Budgie' + }, + { + 'name': 'Fedora-i3-Live', + 'kickstart': 'fedora-live-i3.ks', + 'arches': ['x86_64', 'aarch64'], + 'failable': ['*'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'i3' + }, + { + 'name': 'Fedora-Sway-Live', + 'kickstart': 'fedora-live-sway.ks', + 'arches': ['x86_64'], + 'failable': ['*'], + 'repo': 'Everything', + 'install_tree_from': 'Everything', + 'subvariant': 'Sway' + } + ], + '^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, + "unified_core": True, + "treefile": "fedora-silverblue.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/40/${basearch}/silverblue", + "runroot_packages": ["selinux-policy-targeted"], + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + "^Kinoite$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, + "unified_core": True, + "treefile": "fedora-kinoite.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/40/${basearch}/kinoite", + "runroot_packages": ["selinux-policy-targeted"], + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + "^Sericea$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, + "unified_core": True, + "treefile": "fedora-sericea.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/40/${basearch}/sericea", + "runroot_packages": ["selinux-policy-targeted"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, + "^Onyx$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, + "unified_core": True, + "treefile": "fedora-onyx.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/40/${basearch}/onyx", + "runroot_packages": ["selinux-policy-targeted"], + "arches": ["x86_64"], + "failable": ['*'], + } +} + +ostree_container = { + "^Silverblue$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "treefile": "fedora-silverblue.yaml", + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + "^Kinoite$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "treefile": "fedora-kinoite.yaml", + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + "^Sericea$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "treefile": "fedora-sericea.yaml", + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, + "^Onyx$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f40", + "treefile": "fedora-onyx.yaml", + "arches": ["x86_64"], + "failable": ['*'], + } +} + +ostree_installer = [ + ("^Silverblue$", { + "x86_64": { + "repo": "Everything", + "release": None, + "rootfs_size": "9", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/x86_64/silverblue", + "ostree_update_ref=fedora/40/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", + # keeping them on the stable release until the flatpak sig confirms the next update + "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f40 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.Cheese/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Loupe/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f40', + # 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": "9", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/ppc64le/silverblue", + "ostree_update_ref=fedora/40/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", + # keeping them on the stable release until the flatpak sig confirms the next update + "flatpak_remote_refs=runtime/org.fedoraproject.Platform/ppc64le/f40 app/org.gnome.baobab/ppc64le/stable app/org.gnome.Calculator/ppc64le/stable app/org.gnome.Calendar/ppc64le/stable app/org.gnome.Characters/ppc64le/stable app/org.gnome.Cheese/ppc64le/stable app/org.gnome.clocks/ppc64le/stable app/org.gnome.Connections/ppc64le/stable app/org.gnome.Contacts/ppc64le/stable app/org.gnome.Evince/ppc64le/stable app/org.gnome.Extensions/ppc64le/stable app/org.gnome.font-viewer/ppc64le/stable app/org.gnome.TextEditor/ppc64le/stable app/org.gnome.Loupe/ppc64le/stable app/org.gnome.Logs/ppc64le/stable app/org.gnome.Maps/ppc64le/stable app/org.fedoraproject.MediaWriter/ppc64le/stable app/org.gnome.NautilusPreviewer/ppc64le/stable app/org.gnome.Weather/ppc64le/stable", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f40', + # 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": "9", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/aarch64/silverblue", + "ostree_update_ref=fedora/40/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", + # keeping them on the stable release until the flatpak sig confirms the next update + "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f40 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Cheese/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Loupe/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f40', + # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator + 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], + 'failable': ['*'], + } + }), + ("^Kinoite$", { + "x86_64": { + "repo": "Everything", + "release": None, + "rootfs_size": "10", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/x86_64/kinoite", + "ostree_update_ref=fedora/40/x86_64/kinoite", + "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", + # keeping them on the stable release until the flatpak sig confirms the next update + "flatpak_remote_refs=runtime/org.fedoraproject.KDE5Platform/x86_64/f40 app/org.kde.elisa/x86_64/stable app/org.kde.gwenview/x86_64/stable app/org.kde.kcalc/x86_64/stable app/org.kde.kmahjongg/x86_64/stable app/org.kde.kmines/x86_64/stable app/org.kde.kolourpaint/x86_64/stable app/org.kde.krdc/x86_64/stable app/org.kde.okular/x86_64/stable", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f40', + # 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": "10", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/ppc64le/kinoite", + "ostree_update_ref=fedora/40/ppc64le/kinoite", + "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", + # keeping them on the stable release until the flatpak sig confirms the next update + "flatpak_remote_refs=runtime/org.fedoraproject.KDE5Platform/ppc64le/f40 app/org.kde.elisa/ppc64le/stable app/org.kde.gwenview/ppc64le/stable app/org.kde.kcalc/ppc64le/stable app/org.kde.kmahjongg/ppc64le/stable app/org.kde.kmines/ppc64le/stable app/org.kde.kolourpaint/ppc64le/stable app/org.kde.krdc/ppc64le/stable app/org.kde.okular/ppc64le/stable", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f40', + # 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": "10", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/aarch64/kinoite", + "ostree_update_ref=fedora/40/aarch64/kinoite", + "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", + # keeping them on the stable release until the flatpak sig confirms the next update + "flatpak_remote_refs=runtime/org.fedoraproject.KDE5Platform/aarch64/f40 app/org.kde.elisa/aarch64/stable app/org.kde.gwenview/aarch64/stable app/org.kde.kcalc/aarch64/stable app/org.kde.kmahjongg/aarch64/stable app/org.kde.kmines/aarch64/stable app/org.kde.kolourpaint/aarch64/stable app/org.kde.krdc/aarch64/stable app/org.kde.okular/aarch64/stable", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f40', + # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator + 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], + 'failable': ['*'], + } + }), + ("^Sericea$", { + "x86_64": { + "repo": "Everything", + "release": None, + "rootfs_size": "9", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/x86_64/sericea", + "ostree_update_ref=fedora/40/x86_64/sericea", + "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': 'f40', + # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator + 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], + 'failable': ['*'], + } + }), + ("^Onyx$", { + "x86_64": { + "repo": "Everything", + "release": None, + "rootfs_size": "9", + "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-40-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/40/x86_64/onyx", + "ostree_update_ref=fedora/40/x86_64/onyx", + "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': 'f40', + # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator + 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], + 'failable': ['*'], + } + }) +] + +osbuild = { + '^Workstation$': [ + { + 'name': 'Fedora-Workstation-Live-osb', + 'distro': 'fedora-40', + 'image_types': ['live-installer'], + 'arches': ['x86_64', 'aarch64'], + 'repo': ['Everything'], + 'failable': ['*'], + 'manifest_type': 'live-osbuild', + } + ] + '^Spins$': [ + { + 'name': 'Fedora-Minimal', + 'distro': 'fedora-40', + 'image_types': ['minimal-raw'], + 'arches': ['aarch64'], + 'repo': ['Everything'], + 'manifest_type': 'raw-xz', + 'subvariant': 'Minimal', + } + ] +} + +koji_profile = 'compose_koji' diff --git a/release-candidate.sh b/release-candidate.sh index bf72216..896882b 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/40" #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" NIGHTLY=""