Compare commits
20 Commits
| Author | SHA1 | Date |
|---|---|---|
Mohan Boddu
|
8e6617567a | |
Vipul Siddharth
|
2ca5c2bd99 | |
|
Mohan Boddu
|
0aba979a3a | |
|
Mohan Boddu
|
4d82cf11ed | |
|
Mohan Boddu
|
d2341fd612 | |
|
Mohan Boddu
|
3c367c32aa | |
Kalev Lember
|
22f978148d | |
|
Mohan Boddu
|
2ce744095a | |
|
Mohan Boddu
|
40caaab960 | |
|
Mohan Boddu
|
e176ed52cf | |
|
Mohan Boddu
|
da4228e163 | |
|
Kalev Lember
|
d3de094b4c | |
Dan Horák
|
bea554f60c | |
|
Dan Horák
|
469e9e94f4 | |
Kevin Fenzi
|
091103aab2 | |
|
Mohan Boddu
|
f438d48154 | |
|
Mohan Boddu
|
d143845bc4 | |
|
Kevin Fenzi
|
68cf8faa66 | |
|
Mohan Boddu
|
9f80d09c6c | |
|
Mohan Boddu
|
7500d1ea87 |
|
|
@ -13,9 +13,9 @@ DEST=$(pwd)
|
|||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Cloud"
|
||||
RELEASE="29"
|
||||
RELEASE_TITLE="29"
|
||||
COMPSFILE="comps-f29.xml"
|
||||
RELEASE="32"
|
||||
RELEASE_TITLE="32"
|
||||
COMPSFILE="comps-f32.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ DEST=$(pwd)
|
|||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Docker"
|
||||
RELEASE="29"
|
||||
RELEASE_TITLE="29"
|
||||
COMPSFILE="comps-f29.xml"
|
||||
RELEASE="32"
|
||||
RELEASE_TITLE="32"
|
||||
COMPSFILE="comps-f32.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,838 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = '32'
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'file': 'comps-f32.xml',
|
||||
'command': 'make comps-f32.xml'
|
||||
}
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
|
||||
'branch': 'f32',
|
||||
'dir': '.'
|
||||
}
|
||||
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['12C944D0']
|
||||
|
||||
# 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 = 'f32-build'
|
||||
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
|
||||
# PKGSET - REPOS
|
||||
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
|
||||
# pkgset_repos = {}
|
||||
|
||||
# PKGSET - KOJI
|
||||
pkgset_koji_tag = 'f32-compose'
|
||||
pkgset_koji_inherit = True
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
gather_method = {
|
||||
'^.*': { # For all variants
|
||||
'comps': 'deps', # resolve dependencies for packages from comps file
|
||||
'module': 'nodeps', # but not for packages from modules
|
||||
}
|
||||
}
|
||||
gather_backend = 'dnf'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
repoclosure_backend = 'dnf'
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
# gather_lookaside_repos = []
|
||||
|
||||
# GATHER - JSON
|
||||
# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
|
||||
#gather_source_mapping = '/path/to/mapping.json'
|
||||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_deltas = False
|
||||
createrepo_database = True
|
||||
createrepo_use_xz = True
|
||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
|
||||
createrepo_num_workers = 10
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
media_checksum_one_file = True
|
||||
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s_%(label)s-%(arch)s'
|
||||
#jigdo
|
||||
create_jigdo = False
|
||||
|
||||
# CREATEISO
|
||||
iso_hfs_ppc64le_compatible = False
|
||||
|
||||
# BUILDINSTALL
|
||||
buildinstall_method = 'lorax'
|
||||
buildinstall_skip = [
|
||||
('^Modular$', {
|
||||
'*': True
|
||||
}),
|
||||
('^Everything$', {
|
||||
'i386': True
|
||||
}),
|
||||
]
|
||||
|
||||
# Enables macboot on x86_64 for all variants and disables upgrade image building
|
||||
# everywhere.
|
||||
# Use 3GB image size for all arches.
|
||||
lorax_options = [
|
||||
('^.*$', {
|
||||
'x86_64': {
|
||||
'nomacboot': False
|
||||
},
|
||||
'*': {
|
||||
'noupgrade': True,
|
||||
'rootfs_size': 3
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
#extra_packages = [
|
||||
# '/mnt/packages/foo*',
|
||||
#]
|
||||
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
|
||||
additional_packages = [
|
||||
('^(Server|Everything)$', {
|
||||
'*': [
|
||||
'kernel*',
|
||||
'dracut.*',
|
||||
'autocorr-*',
|
||||
'eclipse-nls',
|
||||
'eclipse-nls-*',
|
||||
'hunspell-*',
|
||||
'hyphen-*',
|
||||
'kde-l10n-*',
|
||||
'libreoffice-langpack-*',
|
||||
'man-pages-*',
|
||||
'mythes-*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Everything$', {
|
||||
'*': [
|
||||
'*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Server$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
]
|
||||
|
||||
multilib = [
|
||||
('^Everything$', {
|
||||
'x86_64': ['devel', 'runtime'],
|
||||
})
|
||||
]
|
||||
|
||||
filter_packages = [
|
||||
("^.*$", {"*": ["glibc32", "libgcc32"]}),
|
||||
('(Server)$', {
|
||||
'*': [
|
||||
'kernel*debug*',
|
||||
'kernel-kdump*',
|
||||
'kernel-tools*',
|
||||
'syslog-ng*',
|
||||
'astronomy-bookmarks',
|
||||
'generic*',
|
||||
'GConf2-dbus*',
|
||||
'bluez-gnome',
|
||||
'java-11-openjdk',
|
||||
'community-mysql*',
|
||||
'jruby*',
|
||||
'gimp-help-*',
|
||||
]
|
||||
}),
|
||||
]
|
||||
|
||||
|
||||
# format: {arch|*: [packages]}
|
||||
multilib_blacklist = {
|
||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||
'php-devel', 'java-*', 'bash-devel',
|
||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
# 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_%(label)s.iso'
|
||||
# # Use the same format for volume id
|
||||
image_volid_formats = [
|
||||
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
|
||||
]
|
||||
# No special handling for layered products, use same format as for regular images
|
||||
image_volid_layered_product_formats = []
|
||||
# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
|
||||
# There is a hard 32-character limit on ISO volume IDs, so we use
|
||||
# these to try and produce short enough but legible IDs. Note this is
|
||||
# duplicated in Koji for live images, as livemedia-creator does not
|
||||
# allow Pungi to tell it what volume ID to use. Note:
|
||||
# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
|
||||
# '-Workstation-' is a temporary workaround. See
|
||||
# https://pagure.io/pungi-fedora/pull-request/525
|
||||
volume_id_substitutions = {
|
||||
'Beta': 'B',
|
||||
'Rawhide': 'rawh',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Silverblue': 'SB',
|
||||
'Cinnamon': 'Cinn',
|
||||
'Cloud': 'C',
|
||||
'Comp_Neuro': 'CNr',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Everything': 'E',
|
||||
'Games': 'Game',
|
||||
'Images': 'img',
|
||||
'Jam_KDE': 'Jam',
|
||||
'MATE_Compiz': 'MATE',
|
||||
# Note https://pagure.io/pungi-fedora/issue/533
|
||||
'Python-Classroom': 'Clss',
|
||||
'Python_Classroom': 'Clss',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Security': 'Sec',
|
||||
'Server': 'S',
|
||||
'-Workstation-': '-WS-',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
'boot': 'netinst',
|
||||
'live': 'Live',
|
||||
}
|
||||
|
||||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32'
|
||||
global_release = '1.2'
|
||||
global_version = '32_Beta'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f32'
|
||||
|
||||
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=f32container", "FGC=f32", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'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=f32container", "FGC=f32", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
'^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', 'ppc64le'],
|
||||
'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', 'ppc64le'],
|
||||
'failable': ['ppc64le'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Workstation'
|
||||
|
||||
}
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'name': 'Fedora-KDE-Live',
|
||||
'kickstart': 'fedora-live-kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'KDE'
|
||||
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Xfce-Live',
|
||||
'kickstart': 'fedora-live-xfce.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Xfce'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-SoaS-Live',
|
||||
'kickstart': 'fedora-live-soas.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'SoaS'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Cinnamon-Live',
|
||||
'kickstart': 'fedora-live-cinnamon.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Cinnamon'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXDE-Live',
|
||||
'kickstart': 'fedora-live-lxde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-MATE_Compiz-Live',
|
||||
'kickstart': 'fedora-live-mate_compiz.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Mate'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXQt-Live',
|
||||
'kickstart': 'fedora-live-lxqt.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXQt'
|
||||
}
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'name': 'Fedora-Astronomy_KDE-Live',
|
||||
'kickstart': 'fedora-live-astronomy_kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Astronomy_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Comp_Neuro-Live',
|
||||
'kickstart': 'fedora-live-comp_neuro.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Comp_Neuro'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Design_suite-Live',
|
||||
'kickstart': 'fedora-live-design_suite.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Design_suite'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Scientific_KDE-Live',
|
||||
'kickstart': 'fedora-live-scientific_kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Scientific_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Games-Live',
|
||||
'kickstart': 'fedora-live-games.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Games'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Security-Live',
|
||||
'kickstart': 'fedora-live-security.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Security'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Jam_KDE-Live',
|
||||
'kickstart': 'fedora-live-jam_kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Jam_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Robotics-Live',
|
||||
'kickstart': 'fedora-live-robotics.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Robotics'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Python-Classroom-Live',
|
||||
'kickstart': 'fedora-live-python-classroom.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom'
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
failable_deliverables = [
|
||||
('^Server$', {
|
||||
'*': ['buildinstall', 'iso'],
|
||||
}),
|
||||
('^.*$', {
|
||||
# Buildinstall is non blocking
|
||||
'src': ['buildinstall'],
|
||||
# Nothing on i386, ppc64le blocks the compose
|
||||
'i386': ['buildinstall', 'iso'],
|
||||
'ppc64le': ['buildinstall', 'iso'],
|
||||
's390x': ['buildinstall', 'iso'],
|
||||
})
|
||||
]
|
||||
|
||||
live_target = 'f32'
|
||||
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": "f32",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
||||
"ostree_ref": "fedora/32/${basearch}/silverblue",
|
||||
"arches": ["x86_64", "ppc64le", "aarch64"],
|
||||
"failable": ['*'],
|
||||
}
|
||||
}
|
||||
|
||||
ostree_installer = [
|
||||
("^Silverblue$", {
|
||||
"x86_64": {
|
||||
"repo": "Everything",
|
||||
"release": None,
|
||||
"rootfs_size": "8",
|
||||
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
||||
"ostree-based-installer/lorax-embed-repo.tmpl",
|
||||
"ostree-based-installer/lorax-embed-flatpaks.tmpl"],
|
||||
"add_template_var": [
|
||||
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
||||
"ostree_update_repo=https://ostree.fedoraproject.org",
|
||||
"ostree_osname=fedora",
|
||||
"ostree_oskey=fedora-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/32/x86_64/silverblue",
|
||||
"ostree_update_ref=fedora/32/x86_64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
|
||||
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f32 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.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': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'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",
|
||||
"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-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/32/ppc64le/silverblue",
|
||||
"ostree_update_ref=fedora/32/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': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'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",
|
||||
"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-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/32/aarch64/silverblue",
|
||||
"ostree_update_ref=fedora/32/aarch64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
|
||||
"flatpak_remote_refs=",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
koji_profile = 'compose_koji'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Cloud'
|
||||
release_short = 'Fedora-Cloud'
|
||||
release_version = '29'
|
||||
release_version = '32'
|
||||
release_is_layered = False
|
||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||
# GENERAL SETTINGS
|
||||
|
|
@ -9,12 +9,12 @@ bootable = False
|
|||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'file': 'comps-f29.xml',
|
||||
'command': 'make comps-f29.xml'
|
||||
'branch': 'main',
|
||||
'file': 'comps-f32.xml',
|
||||
'command': 'make comps-f32.xml'
|
||||
}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['429476B4'] # None = unsigned
|
||||
sigkeys = ['12C944D0'] # None = unsigned
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
|
||||
|
|
@ -26,10 +26,10 @@ hashed_directories = True
|
|||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f29-build'
|
||||
runroot_tag = 'f32-build'
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f29-updates'
|
||||
pkgset_koji_tag = 'f32-updates'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
|
|
@ -107,7 +107,7 @@ filter_packages = [
|
|||
'generic*',
|
||||
'GConf2-dbus*',
|
||||
'bluez-gnome',
|
||||
'java-1.8.0-openjdk',
|
||||
'java-11-openjdk',
|
||||
'community-mysql*',
|
||||
'jruby*',
|
||||
'gimp-help-*',
|
||||
|
|
@ -118,7 +118,7 @@ filter_packages = [
|
|||
multilib_blacklist = {
|
||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||
'php-devel', 'java-*',
|
||||
'php-devel', 'java-*', 'bash-devel',
|
||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
|
||||
],
|
||||
|
|
@ -131,7 +131,10 @@ multilib_whitelist = {
|
|||
'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
|
||||
'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
|
||||
'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
|
||||
'mariadb-connector-odbc', 'compiler-rt'
|
||||
'mariadb-connector-odbc', 'compiler-rt',
|
||||
'nvidia-query-resource-opengl-lib',
|
||||
'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
|
||||
'glib-networking'
|
||||
],
|
||||
}
|
||||
|
||||
|
|
@ -213,19 +216,19 @@ image_build = {
|
|||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Cloud-Base',
|
||||
'target': 'f29',
|
||||
'version': '29',
|
||||
'target': 'f32',
|
||||
'version': '32',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32',
|
||||
'kickstart': 'fedora-cloud-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/'
|
||||
],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/',
|
||||
'subvariant': 'Cloud_Base'
|
||||
}
|
||||
},
|
||||
|
|
@ -233,19 +236,19 @@ image_build = {
|
|||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||
'target': 'f29',
|
||||
'version': '29',
|
||||
'target': 'f32',
|
||||
'version': '32',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32',
|
||||
'kickstart': 'fedora-cloud-base-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/'
|
||||
],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/',
|
||||
'subvariant': 'Cloud_Base',
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Container'
|
||||
release_short = 'Fedora-Container'
|
||||
release_version = '29'
|
||||
release_version = '32'
|
||||
release_is_layered = False
|
||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||
# GENERAL SETTINGS
|
||||
|
|
@ -9,12 +9,12 @@ bootable = False
|
|||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'file': 'comps-f29.xml',
|
||||
'command': 'make comps-f29.xml'
|
||||
'branch': 'main',
|
||||
'file': 'comps-f32.xml',
|
||||
'command': 'make comps-f32.xml'
|
||||
}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['429476B4'] # None = unsigned
|
||||
sigkeys = ['12C944D0'] # None = unsigned
|
||||
# limit tree architectures
|
||||
# if undefined, all architectures from variants.xml will be included
|
||||
tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
|
||||
|
|
@ -26,10 +26,10 @@ hashed_directories = True
|
|||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f29-build'
|
||||
runroot_tag = 'f32-build'
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f29-updates'
|
||||
pkgset_koji_tag = 'f32-updates'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
|
|
@ -107,7 +107,7 @@ filter_packages = [
|
|||
'generic*',
|
||||
'GConf2-dbus*',
|
||||
'bluez-gnome',
|
||||
'java-1.8.0-openjdk',
|
||||
'java-11-openjdk',
|
||||
'community-mysql*',
|
||||
'jruby*',
|
||||
'gimp-help-*',
|
||||
|
|
@ -118,7 +118,7 @@ filter_packages = [
|
|||
multilib_blacklist = {
|
||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||
'php-devel', 'java-*',
|
||||
'php-devel', 'java-*', 'bash-devel',
|
||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
|
||||
],
|
||||
|
|
@ -131,7 +131,10 @@ multilib_whitelist = {
|
|||
'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
|
||||
'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
|
||||
'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
|
||||
'mariadb-connector-odbc', 'compiler-rt'
|
||||
'mariadb-connector-odbc', 'compiler-rt',
|
||||
'nvidia-query-resource-opengl-lib',
|
||||
'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
|
||||
'glib-networking'
|
||||
],
|
||||
}
|
||||
|
||||
|
|
@ -209,10 +212,10 @@ translate_paths = [
|
|||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '29'
|
||||
global_target = 'f29'
|
||||
global_version = '32'
|
||||
global_target = 'f32'
|
||||
|
||||
image_build = {
|
||||
'^Container$': [
|
||||
|
|
@ -224,18 +227,19 @@ image_build = {
|
|||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/'
|
||||
],
|
||||
'subvariant': 'Container_Base'
|
||||
'subvariant': 'Container_Base',
|
||||
'failable': ['armhfp']
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
|
||||
'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -246,18 +250,19 @@ image_build = {
|
|||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/'
|
||||
],
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
'failable': ['armhfp']
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
|
||||
'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,836 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = '32'
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'file': 'comps-f32.xml',
|
||||
'command': 'make comps-f32.xml'
|
||||
}
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
|
||||
'branch': 'f32',
|
||||
'dir': '.'
|
||||
}
|
||||
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['12C944D0']
|
||||
|
||||
# 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 = 'f32-build'
|
||||
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
|
||||
# PKGSET - REPOS
|
||||
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
|
||||
# pkgset_repos = {}
|
||||
|
||||
# PKGSET - KOJI
|
||||
pkgset_koji_tag = 'f32-compose'
|
||||
pkgset_koji_inherit = True
|
||||
|
||||
filter_system_release_packages = False
|
||||
|
||||
# GATHER
|
||||
gather_method = {
|
||||
'^.*': { # For all variants
|
||||
'comps': 'deps', # resolve dependencies for packages from comps file
|
||||
'module': 'nodeps', # but not for packages from modules
|
||||
}
|
||||
}
|
||||
gather_backend = 'dnf'
|
||||
gather_profiler = True
|
||||
check_deps = False
|
||||
greedy_method = 'build'
|
||||
|
||||
repoclosure_backend = 'dnf'
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
|
||||
# gather_lookaside_repos = []
|
||||
|
||||
# GATHER - JSON
|
||||
# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
|
||||
#gather_source_mapping = '/path/to/mapping.json'
|
||||
|
||||
|
||||
# CREATEREPO
|
||||
createrepo_deltas = False
|
||||
createrepo_database = True
|
||||
createrepo_use_xz = True
|
||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
|
||||
createrepo_num_workers = 10
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
media_checksum_one_file = True
|
||||
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.6-%(arch)s'
|
||||
#jigdo
|
||||
create_jigdo = False
|
||||
|
||||
# CREATEISO
|
||||
iso_hfs_ppc64le_compatible = False
|
||||
|
||||
# BUILDINSTALL
|
||||
buildinstall_method = 'lorax'
|
||||
buildinstall_skip = [
|
||||
('^Modular$', {
|
||||
'*': True
|
||||
}),
|
||||
('^Everything$', {
|
||||
'i386': True
|
||||
}),
|
||||
]
|
||||
|
||||
# Enables macboot on x86_64 for all variants and disables upgrade image building
|
||||
# everywhere.
|
||||
# Use 3GB image size for all arches.
|
||||
lorax_options = [
|
||||
('^.*$', {
|
||||
'x86_64': {
|
||||
'nomacboot': False
|
||||
},
|
||||
'*': {
|
||||
'noupgrade': True,
|
||||
'rootfs_size': 3
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
#extra_packages = [
|
||||
# '/mnt/packages/foo*',
|
||||
#]
|
||||
|
||||
|
||||
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
|
||||
additional_packages = [
|
||||
('^(Server|Everything)$', {
|
||||
'*': [
|
||||
'kernel*',
|
||||
'dracut.*',
|
||||
'autocorr-*',
|
||||
'eclipse-nls',
|
||||
'eclipse-nls-*',
|
||||
'hunspell-*',
|
||||
'hyphen-*',
|
||||
'kde-l10n-*',
|
||||
'libreoffice-langpack-*',
|
||||
'man-pages-*',
|
||||
'mythes-*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Everything$', {
|
||||
'*': [
|
||||
'*',
|
||||
],
|
||||
}),
|
||||
|
||||
('^Server$', {
|
||||
'*': [
|
||||
|
||||
],
|
||||
}),
|
||||
|
||||
]
|
||||
|
||||
multilib = [
|
||||
('^Everything$', {
|
||||
'x86_64': ['devel', 'runtime'],
|
||||
})
|
||||
]
|
||||
|
||||
filter_packages = [
|
||||
("^.*$", {"*": ["glibc32", "libgcc32"]}),
|
||||
('(Server)$', {
|
||||
'*': [
|
||||
'kernel*debug*',
|
||||
'kernel-kdump*',
|
||||
'kernel-tools*',
|
||||
'syslog-ng*',
|
||||
'astronomy-bookmarks',
|
||||
'generic*',
|
||||
'GConf2-dbus*',
|
||||
'bluez-gnome',
|
||||
'java-11-openjdk',
|
||||
'community-mysql*',
|
||||
'jruby*',
|
||||
'gimp-help-*',
|
||||
]
|
||||
}),
|
||||
]
|
||||
|
||||
|
||||
# format: {arch|*: [packages]}
|
||||
multilib_blacklist = {
|
||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||
'php-devel', 'java-*', 'bash-devel',
|
||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
# 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.6.iso'
|
||||
# # Use the same format for volume id
|
||||
image_volid_formats = [
|
||||
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
|
||||
]
|
||||
# No special handling for layered products, use same format as for regular images
|
||||
image_volid_layered_product_formats = []
|
||||
# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
|
||||
# There is a hard 32-character limit on ISO volume IDs, so we use
|
||||
# these to try and produce short enough but legible IDs. Note this is
|
||||
# duplicated in Koji for live images, as livemedia-creator does not
|
||||
# allow Pungi to tell it what volume ID to use. Note:
|
||||
# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
|
||||
# '-Workstation-' is a temporary workaround. See
|
||||
# https://pagure.io/pungi-fedora/pull-request/525
|
||||
volume_id_substitutions = {
|
||||
'Beta': 'B',
|
||||
'Rawhide': 'rawh',
|
||||
'Astronomy_KDE': 'AstK',
|
||||
'Silverblue': 'SB',
|
||||
'Cinnamon': 'Cinn',
|
||||
'Cloud': 'C',
|
||||
'Comp_Neuro': 'CNr',
|
||||
'Design_suite': 'Dsgn',
|
||||
'Electronic_Lab': 'Elec',
|
||||
'Everything': 'E',
|
||||
'Games': 'Game',
|
||||
'Images': 'img',
|
||||
'Jam_KDE': 'Jam',
|
||||
'MATE_Compiz': 'MATE',
|
||||
# Note https://pagure.io/pungi-fedora/issue/533
|
||||
'Python-Classroom': 'Clss',
|
||||
'Python_Classroom': 'Clss',
|
||||
'Robotics': 'Robo',
|
||||
'Scientific_KDE': 'SciK',
|
||||
'Security': 'Sec',
|
||||
'Server': 'S',
|
||||
'-Workstation-': '-WS-',
|
||||
}
|
||||
|
||||
disc_types = {
|
||||
'boot': 'netinst',
|
||||
'live': 'Live',
|
||||
}
|
||||
|
||||
translate_paths = [
|
||||
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
|
||||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32'
|
||||
global_release = '1.6'
|
||||
global_version = '32'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f32'
|
||||
|
||||
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=f32container", "FGC=f32", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
'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=f32container", "FGC=f32", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
'^Cloud$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz'), ('vmdk','vmdk')],
|
||||
'name': 'Fedora-Cloud-Base',
|
||||
'kickstart': 'fedora-cloud-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'failable': ['ppc64le', 's390x'],
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||
'kickstart': 'fedora-cloud-base-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'failable': ['*'],
|
||||
},
|
||||
},
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Python-Classroom-Vagrant',
|
||||
'kickstart': 'fedora-python-classroom-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
|
||||
'name': 'Fedora-Scientific-Vagrant',
|
||||
'kickstart': 'fedora-scientific-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Scientific',
|
||||
'failable': ['*'],
|
||||
},
|
||||
'factory-parameters': {
|
||||
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Minimal',
|
||||
'kickstart': 'fedora-disk-minimal.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['armhfp', 'aarch64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Minimal',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Xfce',
|
||||
'kickstart': 'fedora-disk-xfce.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 8,
|
||||
'arches': ['aarch64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Xfce',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Workstation$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Workstation',
|
||||
'kickstart': 'fedora-disk-workstation.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 11,
|
||||
'arches': ['armhfp', 'aarch64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Workstation',
|
||||
'failable': ['armhfp'],
|
||||
}
|
||||
},
|
||||
],
|
||||
'^Server$': [
|
||||
{
|
||||
'image-build': {
|
||||
'format': [('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Server',
|
||||
'kickstart': 'fedora-disk-server.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 7,
|
||||
'arches': ['armhfp', 'aarch64'],
|
||||
'repo': 'Server',
|
||||
'install_tree_from': 'Server',
|
||||
'subvariant': 'Server',
|
||||
'failable': ['*'],
|
||||
}
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
live_media = {
|
||||
'^Workstation$': [
|
||||
{
|
||||
'name': 'Fedora-Workstation-Live',
|
||||
'kickstart': 'fedora-live-workstation.ks',
|
||||
'arches': ['x86_64', 'ppc64le'],
|
||||
'failable': ['ppc64le'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Workstation'
|
||||
|
||||
}
|
||||
],
|
||||
'^Spins': [
|
||||
{
|
||||
'name': 'Fedora-KDE-Live',
|
||||
'kickstart': 'fedora-live-kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'KDE'
|
||||
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Xfce-Live',
|
||||
'kickstart': 'fedora-live-xfce.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Xfce'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-SoaS-Live',
|
||||
'kickstart': 'fedora-live-soas.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'SoaS'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Cinnamon-Live',
|
||||
'kickstart': 'fedora-live-cinnamon.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Cinnamon'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXDE-Live',
|
||||
'kickstart': 'fedora-live-lxde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-MATE_Compiz-Live',
|
||||
'kickstart': 'fedora-live-mate_compiz.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Mate'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-LXQt-Live',
|
||||
'kickstart': 'fedora-live-lxqt.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'LXQt'
|
||||
}
|
||||
],
|
||||
'^Labs$': [
|
||||
{
|
||||
'name': 'Fedora-Astronomy_KDE-Live',
|
||||
'kickstart': 'fedora-live-astronomy_kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Astronomy_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Comp_Neuro-Live',
|
||||
'kickstart': 'fedora-live-comp_neuro.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Comp_Neuro'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Design_suite-Live',
|
||||
'kickstart': 'fedora-live-design_suite.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Design_suite'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Scientific_KDE-Live',
|
||||
'kickstart': 'fedora-live-scientific_kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Scientific_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Games-Live',
|
||||
'kickstart': 'fedora-live-games.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Games'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Security-Live',
|
||||
'kickstart': 'fedora-live-security.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Security'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Jam_KDE-Live',
|
||||
'kickstart': 'fedora-live-jam_kde.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Jam_KDE'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Robotics-Live',
|
||||
'kickstart': 'fedora-live-robotics.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Robotics'
|
||||
},
|
||||
{
|
||||
'name': 'Fedora-Python-Classroom-Live',
|
||||
'kickstart': 'fedora-live-python-classroom.ks',
|
||||
'arches': ['x86_64'],
|
||||
'failable': ['*'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Python_Classroom'
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
failable_deliverables = [
|
||||
('^Server$', {
|
||||
'*': ['buildinstall', 'iso'],
|
||||
}),
|
||||
('^.*$', {
|
||||
# Buildinstall is non blocking
|
||||
'src': ['buildinstall'],
|
||||
# Nothing on i386, ppc64le blocks the compose
|
||||
'i386': ['buildinstall', 'iso'],
|
||||
'ppc64le': ['buildinstall', 'iso'],
|
||||
's390x': ['buildinstall', 'iso'],
|
||||
})
|
||||
]
|
||||
|
||||
live_target = 'f32'
|
||||
live_images_no_rename = True
|
||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||
live_images = [
|
||||
('^Workstation$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-workstation.ks',
|
||||
'name': 'Fedora-Workstation-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
('^Server$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-server.ks',
|
||||
'name': 'Fedora-Server-armhfp',
|
||||
'type': 'appliance',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
('^Spins$', {
|
||||
'armhfp': [{
|
||||
'kickstart': 'fedora-arm-kde.ks',
|
||||
'name': 'Fedora-KDE-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'KDE',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxde.ks',
|
||||
'name': 'Fedora-LXDE-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'LXDE',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-mate.ks',
|
||||
'name': 'Fedora-Mate-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Mate',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-minimal.ks',
|
||||
'name': 'Fedora-Minimal-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Minimal',
|
||||
'failable': False,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-soas.ks',
|
||||
'name': 'Fedora-SoaS-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'SoaS',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-xfce.ks',
|
||||
'name': 'Fedora-Xfce-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Xfce',
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxqt.ks',
|
||||
'name': 'Fedora-LXQt-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'LXQt',
|
||||
'failable': True,
|
||||
},]
|
||||
}),
|
||||
('^Labs$', {
|
||||
'armhfp': {
|
||||
'kickstart': 'fedora-arm-python-classroom.ks',
|
||||
'name': 'Fedora-Python-Classroom-armhfp',
|
||||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Python_Classroom',
|
||||
'failable': True,
|
||||
}
|
||||
}),
|
||||
]
|
||||
|
||||
ostree = {
|
||||
"^Silverblue$": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"force_new_commit": True,
|
||||
"treefile": "fedora-silverblue.yaml",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "f32",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
||||
"ostree_ref": "fedora/32/${basearch}/silverblue",
|
||||
"arches": ["x86_64", "ppc64le", "aarch64"],
|
||||
"failable": ['*'],
|
||||
}
|
||||
}
|
||||
|
||||
ostree_installer = [
|
||||
("^Silverblue$", {
|
||||
"x86_64": {
|
||||
"repo": "Everything",
|
||||
"release": None,
|
||||
"rootfs_size": "8",
|
||||
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
||||
"ostree-based-installer/lorax-embed-repo.tmpl",
|
||||
"ostree-based-installer/lorax-embed-flatpaks.tmpl"],
|
||||
"add_template_var": [
|
||||
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
||||
"ostree_update_repo=https://ostree.fedoraproject.org",
|
||||
"ostree_osname=fedora",
|
||||
"ostree_oskey=fedora-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/32/x86_64/silverblue",
|
||||
"ostree_update_ref=fedora/32/x86_64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
|
||||
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f32 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.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': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'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-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/32/ppc64le/silverblue",
|
||||
"ostree_update_ref=fedora/32/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': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'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-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/32/aarch64/silverblue",
|
||||
"ostree_update_ref=fedora/32/aarch64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
|
||||
"flatpak_remote_refs=",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
|
||||
koji_profile = 'compose_koji'
|
||||
50
fedora.conf
50
fedora.conf
|
|
@ -1,20 +1,20 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = 'Rawhide'
|
||||
release_version = '32'
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'file': 'comps-rawhide.xml',
|
||||
'command': 'make comps-rawhide.xml'
|
||||
'file': 'comps-f32.xml',
|
||||
'command': 'make comps-f32.xml'
|
||||
}
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
|
||||
'branch': 'master',
|
||||
'branch': 'f32',
|
||||
'dir': '.'
|
||||
}
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ repoclosure_backend = 'dnf'
|
|||
createrepo_deltas = False
|
||||
createrepo_database = True
|
||||
createrepo_use_xz = True
|
||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']
|
||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
|
||||
createrepo_num_workers = 10
|
||||
|
||||
# CHECKSUMS
|
||||
|
|
@ -289,9 +289,9 @@ translate_paths = [
|
|||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = 'Rawhide'
|
||||
global_version = '32'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f32'
|
||||
|
||||
|
|
@ -442,11 +442,11 @@ image_build = {
|
|||
'kickstart': 'fedora-disk-workstation.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 11,
|
||||
'arches': ['armhfp', 'aarch64', 'ppc64le'],
|
||||
'arches': ['armhfp', 'aarch64'],
|
||||
'repo': 'Everything',
|
||||
'install_tree_from': 'Everything',
|
||||
'subvariant': 'Workstation',
|
||||
'failable': ['*'],
|
||||
'failable': ['armhfp'],
|
||||
}
|
||||
},
|
||||
],
|
||||
|
|
@ -713,7 +713,7 @@ live_images = [
|
|||
'repo': 'Everything',
|
||||
'type': 'appliance',
|
||||
'subvariant': 'Xfce',
|
||||
'failable': False,
|
||||
'failable': True,
|
||||
},
|
||||
{
|
||||
'kickstart': 'fedora-arm-lxqt.ks',
|
||||
|
|
@ -742,11 +742,11 @@ ostree = {
|
|||
"force_new_commit": True,
|
||||
"treefile": "fedora-silverblue.yaml",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f32",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
||||
"ostree_ref": "fedora/rawhide/${basearch}/silverblue",
|
||||
"ostree_ref": "fedora/32/${basearch}/silverblue",
|
||||
"arches": ["x86_64", "ppc64le", "aarch64"],
|
||||
"failable": ['*'],
|
||||
}
|
||||
|
|
@ -767,16 +767,16 @@ ostree_installer = [
|
|||
"ostree_osname=fedora",
|
||||
"ostree_oskey=fedora-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/x86_64/silverblue",
|
||||
"ostree_update_ref=fedora/rawhide/x86_64/silverblue",
|
||||
"ostree_install_ref=fedora/32/x86_64/silverblue",
|
||||
"ostree_update_ref=fedora/32/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/f31 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",
|
||||
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f32 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
},
|
||||
|
|
@ -785,16 +785,15 @@ ostree_installer = [
|
|||
"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"],
|
||||
"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-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
|
||||
"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
|
||||
"ostree_install_ref=fedora/32/ppc64le/silverblue",
|
||||
"ostree_update_ref=fedora/32/ppc64le/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
|
|
@ -802,7 +801,7 @@ ostree_installer = [
|
|||
"flatpak_remote_refs=",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
},
|
||||
|
|
@ -811,16 +810,15 @@ ostree_installer = [
|
|||
"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"],
|
||||
"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-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/aarch64/silverblue",
|
||||
"ostree_update_ref=fedora/rawhide/aarch64/silverblue",
|
||||
"ostree_install_ref=fedora/32/aarch64/silverblue",
|
||||
"ostree_update_ref=fedora/32/aarch64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
|
|
@ -828,7 +826,7 @@ ostree_installer = [
|
|||
"flatpak_remote_refs=",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
}
|
||||
|
|
|
|||
27
nightly.sh
27
nightly.sh
|
|
@ -4,19 +4,19 @@
|
|||
export LC_ALL=C
|
||||
|
||||
CONFIG="fedora.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/rawhide"
|
||||
TARGET_DIR="/mnt/koji/compose/branched"
|
||||
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
||||
NIGHTLY="--nightly"
|
||||
SKIP_PHASES="--skip-phase=productimg"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
SHORT="Fedora"
|
||||
RELEASE="rawhide"
|
||||
RELEASE_TITLE="Rawhide"
|
||||
COMPSFILE="comps-rawhide.xml"
|
||||
RELEASE="32"
|
||||
RELEASE_TITLE="32"
|
||||
COMPSFILE="comps-f32.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
||||
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
RSYNCPREFIX="sudo -u ftpsync"
|
||||
RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
|
||||
RSYNCALTTARGET="/pub/alt/development/$RELEASE"
|
||||
|
|
@ -111,7 +111,7 @@ fi
|
|||
./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
|
||||
|
||||
[ -z "$ARCH" ] && {
|
||||
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
|
||||
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
|
||||
}
|
||||
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
|
|
@ -187,20 +187,19 @@ $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
|
|||
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
|
||||
|
||||
# sync Silverblue to the unified ostree repo
|
||||
# Set the umask to so directories can get group write
|
||||
# https://pagure.io/releng/issue/8811
|
||||
old_umask=$(umask)
|
||||
umask 0002
|
||||
for arch in x86_64 ppc64le aarch64; do
|
||||
ref="fedora/rawhide/${arch}/silverblue"
|
||||
ref="fedora/32/${arch}/silverblue"
|
||||
if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
|
||||
|
||||
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
|
||||
ostree summary -u --repo=$OSTREEDESTREPO # update summary file
|
||||
done
|
||||
|
||||
# Push rawhide base container image to fedora registry
|
||||
pushd ./releng
|
||||
pushd ./scripts
|
||||
./sync-latest-container-base-image.sh 32
|
||||
popd
|
||||
popd
|
||||
# Set to old umask
|
||||
umask $old_umask
|
||||
|
||||
# Tell interested persons that the rsync is done.
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ LABEL=$1
|
|||
# to the script are passed to pungi-koji directly.
|
||||
shift
|
||||
CONFIG="fedora-final.conf"
|
||||
TARGET_DIR="/mnt/koji/compose/26"
|
||||
TARGET_DIR="/mnt/koji/compose/32"
|
||||
#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-f32.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
|
||||
|
|
|
|||
Loading…
Reference in New Issue