From bbf312bc063d75c4cb42794671e16a3b8ef554ae Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Fri, 11 Mar 2022 14:49:49 +0100 Subject: [PATCH] Preparation for f36 Beta 1.1 Signed-off-by: Tomas Hrcka --- fedora-beta.conf | 933 +++++++++++++++++++++++++++++++++++++++++++ release-candidate.sh | 8 +- 2 files changed, 937 insertions(+), 4 deletions(-) create mode 100644 fedora-beta.conf diff --git a/fedora-beta.conf b/fedora-beta.conf new file mode 100644 index 0000000..66413fe --- /dev/null +++ b/fedora-beta.conf @@ -0,0 +1,933 @@ +# PRODUCT INFO +release_name = 'Fedora' +release_short = 'Fedora' +release_version = '36' + +# GENERAL SETTINGS +comps_file = { + 'scm': 'git', + 'repo': 'https://pagure.io/fedora-comps.git', + 'branch': 'main', + 'file': 'comps-f36.xml', + 'command': 'make comps-f36.xml' +} +module_defaults_dir = { + 'scm': 'git', + 'repo': 'https://pagure.io/releng/fedora-module-defaults.git', + 'branch': 'f36', + 'dir': '.' +} +module_obsoletes_dir = { + 'scm': 'git', + 'repo': 'https://pagure.io/releng/fedora-module-defaults.git', + 'branch': 'f36', + 'dir': 'obsoletes' +} + +variants_file='variants-fedora.xml' +sigkeys = ['38AB71F4'] + +# 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 = 'f36-build' + +# PKGSET +pkgset_source = 'koji' # koji, repos + +# PKGSET - REPOS +# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]} +# pkgset_repos = {} + +# PKGSET - KOJI +pkgset_koji_tag = 'f36-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' + +# 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 = ['--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*', +#] + + +# 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$', { + '*': [ + + ], + }), + +] + +multilib = [ + ('^Everything$', { + 'x86_64': ['devel', 'runtime'], + }) +] + +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-*', + ] + }), +] + +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 + }), + + ] + +# 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' + ] +# 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', + 'Kinoite': 'Knt', + '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/f36' +global_release = '1.1' +global_version = '36_Beta' +# live_images ignores this in favor of live_target +global_target = 'f36' + +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=f36container", "FGC=f36", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "36"}', + }, + }, + { + '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=f36container", "FGC=f36", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "36"}', + }, + } + ], + '^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': 12, + 'arches': ['aarch64'], + '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': ['aarch64'], + } + }, + { + 'image-build': { + 'format': [('raw-xz','raw.xz')], + 'name': 'Fedora-KDE', + 'kickstart': 'fedora-disk-kde.ks', + 'distro': 'Fedora-30', + 'disk_size': 14, + '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': 10, + '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': 13, + '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": "f36", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/36/${basearch}/silverblue", + "arches": ["x86_64", "ppc64le", "aarch64"], + "failable": ['*'], + }, + "^Kinoite$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, + "treefile": "fedora-kinoite.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f36", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/36/${basearch}/kinoite", + "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-36-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/36/x86_64/silverblue", + "ostree_update_ref=fedora/36/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/f36 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.Connections/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.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/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': 'f36', + # 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-36-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/36/ppc64le/silverblue", + "ostree_update_ref=fedora/36/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': 'f36', + # 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-36-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/36/aarch64/silverblue", + "ostree_update_ref=fedora/36/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=runtime/org.fedoraproject.Platform/aarch64/f36 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.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/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.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': 'f36', + # 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": "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-36-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/36/x86_64/kinoite", + "ostree_update_ref=fedora/36/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", + "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f36", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f36', + # 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-36-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/36/ppc64le/kinoite", + "ostree_update_ref=fedora/36/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", + "flatpak_remote_refs=", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f36', + # 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-36-primary", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", + "ostree_install_ref=fedora/36/aarch64/kinoite", + "ostree_update_ref=fedora/36/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", + "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f36", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'f36', + # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator + 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], + 'failable': ['*'], + } + }) +] + +koji_profile = 'compose_koji' diff --git a/release-candidate.sh b/release-candidate.sh index 133f826..5e3a879 100755 --- a/release-candidate.sh +++ b/release-candidate.sh @@ -4,14 +4,14 @@ 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-final.conf" -TARGET_DIR="/mnt/koji/compose/26" +CONFIG="fedora-beta.conf" +TARGET_DIR="/mnt/koji/compose/36" #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-f36.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