Compare commits

...

27 Commits
main ... f30

Author SHA1 Message Date
Clement Verna 7b1aeeab68 Set the container environment variable to oci.
Certain applications are using the container env variable to
know if they are running in a container or not. This is making sure

we have this define in the fedora base image..

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1399507

Signed-off-by: Clement Verna <cverna@tutanota.com>
2019-07-07 10:10:52 +02:00
Mohan Boddu 5353e8715f Making armhfp container failable
Waiting for the fix on https://pagure.io/releng/issue/8173

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-06-03 09:22:41 -04:00
Kevin Fenzi 8411d2599b Also fix up the configs
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-04-27 13:07:39 -07:00
Kevin Fenzi 52d6f9ba87 cloud/container nightly: fix f29 to f30
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-04-27 12:44:28 -07:00
Mohan Boddu 3499a47bb1 Setup for F30 Final 1.2
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-04-25 17:42:55 -04:00
Mohan Boddu 87c5c557e9 Setup for F30 Final
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-04-23 18:35:58 -04:00
Mohan Boddu c48d3b54ff F30 Beta is out
Since F30 Beta is out, the config for it should not be changed anymore.

This is caused by https://pagure.io/pungi-fedora/pull-request/720

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-04-09 15:48:25 -04:00
Jonathan Dieter af58996b19 Re-enable zchunk metadata generation
This patch re-enables zchunk metadata generation for F30 as per FESCo's
decision at https://pagure.io/fesco/issue/2116

Signed-off-by: Jonathan Dieter <jdieter@fedoraproject.org>
2019-04-09 19:00:07 +01:00
Sinny Kumari 5420bb8b64 Update ostree remote name to fedora-workstation to fedora
This is to keep in sync with ostree config fedora.conf
which we ship as part of ostree update through fedora-repos-ostree

Signed-off-by: Sinny Kumari <sinny@redhat.com>
2019-04-03 23:31:49 +05:30
Mohan Boddu 02d897cbd3 Setup for F30 Beta 1.8
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-25 18:42:34 -04:00
Kevin Fenzi 9b4bac505e fedora-beta: rc7
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-03-23 12:00:57 -07:00
Kevin Fenzi db570d3b3a beta: We need a rc6.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-03-21 17:54:35 -07:00
Mohan Boddu 036692d87b Setup for F30 Beta 1.5
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-21 13:11:28 -04:00
Mohan Boddu 06245f085c Setup for F30 Beta 1.4 compose
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-20 11:15:59 -04:00
Mohan Boddu d4d735a759 Setup for F30 Beta 1.3
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-19 16:49:42 -04:00
Mohan Boddu e07dc8a292 Setup for F30 Beta 1.2
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-19 15:39:41 -04:00
Jonathan Dieter 6c392f1694 Remove zchunk metadata generation from beta as well
Signed-off-by: Jonathan Dieter <jdieter@fedoraproject.org>
2019-03-19 19:27:33 +00:00
Jonathan Dieter 96adf9ab12 Remove zchunk metadata generation
Signed-off-by: Jonathan Dieter <jdieter@fedoraproject.org>
2019-03-19 19:22:48 +00:00
Mohan Boddu 9f9178524f Setup for F30 Beta 1.1
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-18 16:05:58 -04:00
Mohan Boddu b17b004349 Changing to https
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-17 15:28:10 -04:00
Dan Horák cd7ab19139 disable Apple/HFS compat bits for ISOs on ppc64le
Signed-off-by: Dan Horák <dan@danny.cz>
2019-03-04 21:08:42 +00:00
Peter Robinson e9b43f0895 Merge #697 `Add armhfp for the existing aarch64 image builds`
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2019-03-02 11:05:50 +00:00
Mohan Boddu 327ee46127 ostree sync to 30 ref
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-01 10:44:10 -05:00
Peter Robinson de404698ac Add armhfp for the existing aarch64 image builds
As part of the UEFI on ARMv7 feature we build the images the same
as aarch64 using image factory. This is initiall enabling the
Minimal/Server/Workstation images to allow wider testing. Once we
know they're good we'll move all the others over and remove the old
build mechanism that uses appliance-creator.

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2019-02-28 20:26:14 +00:00
Kevin Fenzi 30bc0f9a49 fedora.conf: fix errants 31's. This is f30 branched, so everything is f30 here.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-02-19 16:31:30 -08:00
Tomas Hrcka 0c2ddd833f Rawhide is f31
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2019-02-19 19:36:49 +01:00
Tomas Hrcka 539f0294f2 Branching F30 from rawhide
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2019-02-19 16:53:06 +01:00
9 changed files with 1616 additions and 72 deletions

View File

@ -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="30"
RELEASE_TITLE="30"
COMPSFILE="comps-f30.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

View File

@ -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="30"
RELEASE_TITLE="30"
COMPSFILE="comps-f30.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

769
fedora-beta.conf Normal file
View File

@ -0,0 +1,769 @@
# PRODUCT INFO
release_name = 'Fedora'
release_short = 'Fedora'
release_version = '30'
release_is_layered = False
# GENERAL SETTINGS
bootable = True
comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-f30.xml',
'command': 'make comps-f30.xml'
}
module_defaults_dir = {
'scm': 'git',
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
'branch': 'f30',
'dir': '.'
}
variants_file='variants-fedora.xml'
sigkeys = ['CFC659B9']
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64le', 's390x', 'x86_64']
# limit tree variants
# if undefined, all variants from variants.xml will be included
#tree_variants = ['Server']
hashed_directories = True
# RUNROOT settings
runroot = True
runroot_channel = 'compose'
runroot_tag = 'f30-build'
## PDC settings
pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
pdc_insecure = False
# This option will skip getting an authentication token via Kerberos.
pdc_develop = True
# PKGSET
pkgset_source = 'koji' # koji, repos
# PKGSET - REPOS
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
# pkgset_repos = {}
# PKGSET - KOJI
pkgset_koji_tag = 'f30-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
# 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
}),
]
# Enables macboot on x86_64 for all variants and disables upgrade image building
# everywhere.
# Use 3GB image size for ppc64le.
lorax_options = [
('^.*$', {
'x86_64': {
'nomacboot': False
},
'ppc64le': {
'rootfs_size': 3
},
'*': {
'noupgrade': True
}
})
]
#extra_packages = [
# '/mnt/packages/foo*',
#]
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
additional_packages = [
('^(Workstation|Server|Everything)$', {
'*': [
'kernel*',
'dracut*',
'autocorr-*',
'eclipse-nls',
'eclipse-nls-*',
'hunspell-*',
'hyphen-*',
'kde-l10n-*',
'libreoffice-langpack-*',
'man-pages-*',
'mythes-*',
],
}),
('^Everything$', {
'*': [
'*',
],
}),
('^Server$', {
'*': [
],
}),
('^Workstation$', {
'*': [
],
}),
]
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
})
]
filter_packages = [
("^.*$", {"*": ["glibc32", "libgcc32"]}),
('(Workstation|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-*',
'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'
],
}
createiso_skip = [
('^Workstation$', {
'*': True,
'src': True
}),
('^Server$', {
'src': True
}),
('^Everything$', {
'*': True,
'src': True
}),
('^Modular$', {
'*': True,
'src': True
}),
]
# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
#extra_files = [
# ('^(Server|Workstation)$', {
# '*': [
# {
# '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',
'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/f30'
global_release = '1.8'
global_version = '30_Beta'
# live_images ignores this in favor of live_target
global_target = 'f30'
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=f30container", "FGC=f30" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
},
},
{
'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=f30container", "FGC=f30" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
},
}
],
'^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','i386'],
'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','i386'],
'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': ['*'],
}
},
],
'^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': 'Workstation',
'install_tree_from': 'Workstation',
'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', 'i386'],
'failable': ['i386'],
'repo': 'Everything',
'subvariant': 'Workstation'
}
],
'^Spins': [
{
'name': 'Fedora-KDE-Live',
'kickstart': 'fedora-live-kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['i386'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'KDE'
},
{
'name': 'Fedora-Xfce-Live',
'kickstart': 'fedora-live-xfce.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Xfce'
},
{
'name': 'Fedora-SoaS-Live',
'kickstart': 'fedora-live-soas.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'SoaS'
},
{
'name': 'Fedora-Cinnamon-Live',
'kickstart': 'fedora-live-cinnamon.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Cinnamon'
},
{
'name': 'Fedora-LXDE-Live',
'kickstart': 'fedora-live-lxde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'LXDE'
},
{
'name': 'Fedora-MATE_Compiz-Live',
'kickstart': 'fedora-live-mate_compiz.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Mate'
},
{
'name': 'Fedora-LXQt-Live',
'kickstart': 'fedora-live-lxqt.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'LXQt'
}
],
'^Labs$': [
{
'name': 'Fedora-Astronomy_KDE-Live',
'kickstart': 'fedora-live-astronomy_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Astronomy_KDE'
},
{
'name': 'Fedora-Design_suite-Live',
'kickstart': 'fedora-live-design_suite.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Design_suite'
},
{
'name': 'Fedora-Scientific_KDE-Live',
'kickstart': 'fedora-live-scientific_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Scientific_KDE'
},
{
'name': 'Fedora-Games-Live',
'kickstart': 'fedora-live-games.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Games'
},
{
'name': 'Fedora-Security-Live',
'kickstart': 'fedora-live-security.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Security'
},
{
'name': 'Fedora-Jam_KDE-Live',
'kickstart': 'fedora-live-jam_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Jam_KDE'
},
{
'name': 'Fedora-Robotics-Live',
'kickstart': 'fedora-live-robotics.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Robotics'
},
{
'name': 'Fedora-Python-Classroom-Live',
'kickstart': 'fedora-live-python-classroom.ks',
'arches': ['x86_64', 'i386'],
'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 = 'f30'
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',
'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": "f30",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/30/${basearch}/silverblue",
"arches": ["x86_64"],
"failable": ['*'],
}
}
ostree_installer = [
("^Silverblue$", {
"x86_64": {
"repo": "Everything",
"release": None,
"rootfs_size": "8",
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
"ostree-based-installer/lorax-embed-repo.tmpl"],
"add_template_var": [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org",
"ostree_osname=fedora-workstation",
"ostree_oskey=fedora-30-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/30/x86_64/silverblue",
"ostree_update_ref=fedora/30/x86_64/silverblue",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'f30',
'failable': ['*'],
}
})
]
koji_profile = 'compose_koji'

View File

@ -1,7 +1,7 @@
# PRODUCT INFO
release_name = 'Fedora-Cloud'
release_short = 'Fedora-Cloud'
release_version = '29'
release_version = '30'
release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS
@ -10,11 +10,11 @@ comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-f29.xml',
'command': 'make comps-f29.xml'
'file': 'comps-f30.xml',
'command': 'make comps-f30.xml'
}
variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned
sigkeys = ['CFC659B9'] # 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 = 'f30-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f29-updates'
pkgset_koji_tag = 'f30-updates'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
@ -205,7 +205,7 @@ disc_types = {
'live': 'Live',
}
translate_paths = [
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
]
image_build = {
'^Cloud$': [
@ -213,19 +213,19 @@ image_build = {
'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
'name': 'Fedora-Cloud-Base',
'target': 'f29',
'version': '29',
'target': 'f30',
'version': '30',
'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f30',
'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/f30-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/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/30/latest-Fedora-30/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base'
}
},
@ -233,19 +233,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': 'f30',
'version': '30',
'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f30',
'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/f30-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/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/30/latest-Fedora-30/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base',
}
},

View File

@ -1,7 +1,7 @@
# PRODUCT INFO
release_name = 'Fedora-Container'
release_short = 'Fedora-Container'
release_version = '29'
release_version = '30'
release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS
@ -10,11 +10,11 @@ comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-f29.xml',
'command': 'make comps-f29.xml'
'file': 'comps-f30.xml',
'command': 'make comps-f30.xml'
}
variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned
sigkeys = ['CFC659B9'] # 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 = 'f30-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f29-updates'
pkgset_koji_tag = 'f30-updates'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
@ -205,14 +205,14 @@ disc_types = {
'live': 'Live',
}
translate_paths = [
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
('/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/f29'
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f30'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '29'
global_target = 'f29'
global_version = '30'
global_target = 'f30'
image_build = {
'^Container$': [
@ -224,18 +224,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/30/latest-Fedora-30/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/f30-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/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" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
'docker_env': '[ "DISTTAG=f30container", "FGC=f30", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
},
},
{
@ -246,18 +247,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/30/latest-Fedora-30/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/f30-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/30/latest-Fedora-30/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" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
'docker_env': '[ "DISTTAG=f30container", "FGC=f30", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
},
}
],

770
fedora-final.conf Normal file
View File

@ -0,0 +1,770 @@
# PRODUCT INFO
release_name = 'Fedora'
release_short = 'Fedora'
release_version = '30'
release_is_layered = False
# GENERAL SETTINGS
bootable = True
comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-f30.xml',
'command': 'make comps-f30.xml'
}
module_defaults_dir = {
'scm': 'git',
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
'branch': 'f30',
'dir': '.'
}
variants_file='variants-fedora.xml'
sigkeys = ['CFC659B9']
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64le', 's390x', 'x86_64']
# limit tree variants
# if undefined, all variants from variants.xml will be included
#tree_variants = ['Server']
hashed_directories = True
# RUNROOT settings
runroot = True
runroot_channel = 'compose'
runroot_tag = 'f30-build'
## PDC settings
pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
pdc_insecure = False
# This option will skip getting an authentication token via Kerberos.
pdc_develop = True
# PKGSET
pkgset_source = 'koji' # koji, repos
# PKGSET - REPOS
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
# pkgset_repos = {}
# PKGSET - KOJI
pkgset_koji_tag = 'f30-compose'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
gather_method = {
'^.*': { # For all variants
'comps': 'deps', # resolve dependencies for packages from comps file
'module': 'nodeps', # but not for packages from modules
}
}
gather_backend = 'dnf'
gather_profiler = True
check_deps = False
greedy_method = 'build'
repoclosure_backend = 'dnf'
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
# gather_lookaside_repos = []
# GATHER - JSON
# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
#gather_source_mapping = '/path/to/mapping.json'
# CREATEREPO
createrepo_deltas = False
createrepo_database = True
createrepo_use_xz = True
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
# CHECKSUMS
media_checksums = ['sha256']
media_checksum_one_file = True
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.2-%(arch)s'
#jigdo
create_jigdo = False
# CREATEISO
iso_hfs_ppc64le_compatible = False
# BUILDINSTALL
buildinstall_method = 'lorax'
buildinstall_skip = [
('^Modular$', {
'*': True
}),
]
# Enables macboot on x86_64 for all variants and disables upgrade image building
# everywhere.
# Use 3GB image size for ppc64le.
lorax_options = [
('^.*$', {
'x86_64': {
'nomacboot': False
},
'ppc64le': {
'rootfs_size': 3
},
'*': {
'noupgrade': True
}
})
]
#extra_packages = [
# '/mnt/packages/foo*',
#]
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
additional_packages = [
('^(Workstation|Server|Everything)$', {
'*': [
'kernel*',
'dracut*',
'autocorr-*',
'eclipse-nls',
'eclipse-nls-*',
'hunspell-*',
'hyphen-*',
'kde-l10n-*',
'libreoffice-langpack-*',
'man-pages-*',
'mythes-*',
],
}),
('^Everything$', {
'*': [
'*',
],
}),
('^Server$', {
'*': [
],
}),
('^Workstation$', {
'*': [
],
}),
]
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
})
]
filter_packages = [
("^.*$", {"*": ["glibc32", "libgcc32"]}),
('(Workstation|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-*',
'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'
],
}
createiso_skip = [
('^Workstation$', {
'*': True,
'src': True
}),
('^Server$', {
'src': True
}),
('^Everything$', {
'*': True,
'src': True
}),
('^Modular$', {
'*': True,
'src': True
}),
]
# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
#extra_files = [
# ('^(Server|Workstation)$', {
# '*': [
# {
# 'scm': 'rpm',
# 'repo': 'fedora-release-%(variant_id_lower)s',
# 'branch': None,
# 'file': [
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
# ],
# 'target': '',
# },
# ],
# }),
#]
# Image name respecting Fedora's image naming policy
image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.2.iso'
# # Use the same format for volume id
image_volid_formats = [
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
]
# No special handling for layered products, use same format as for regular images
image_volid_layered_product_formats = []
# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
# There is a hard 32-character limit on ISO volume IDs, so we use
# these to try and produce short enough but legible IDs. Note this is
# duplicated in Koji for live images, as livemedia-creator does not
# allow Pungi to tell it what volume ID to use. Note:
# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
# '-Workstation-' is a temporary workaround. See
# https://pagure.io/pungi-fedora/pull-request/525
volume_id_substitutions = {
'Beta': 'B',
'Rawhide': 'rawh',
'Astronomy_KDE': 'AstK',
'Silverblue': 'SB',
'Cinnamon': 'Cinn',
'Cloud': 'C',
'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/f30'
global_release = '1.2'
global_version = '30'
# live_images ignores this in favor of live_target
global_target = 'f30'
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=f30container", "FGC=f30" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
},
},
{
'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=f30container", "FGC=f30" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
},
}
],
'^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','i386'],
'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','i386'],
'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': ['*'],
}
},
],
'^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': 'Workstation',
'install_tree_from': 'Workstation',
'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', 'i386'],
'failable': ['i386'],
'repo': 'Everything',
'subvariant': 'Workstation'
}
],
'^Spins': [
{
'name': 'Fedora-KDE-Live',
'kickstart': 'fedora-live-kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['i386'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'KDE'
},
{
'name': 'Fedora-Xfce-Live',
'kickstart': 'fedora-live-xfce.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Xfce'
},
{
'name': 'Fedora-SoaS-Live',
'kickstart': 'fedora-live-soas.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'SoaS'
},
{
'name': 'Fedora-Cinnamon-Live',
'kickstart': 'fedora-live-cinnamon.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Cinnamon'
},
{
'name': 'Fedora-LXDE-Live',
'kickstart': 'fedora-live-lxde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'LXDE'
},
{
'name': 'Fedora-MATE_Compiz-Live',
'kickstart': 'fedora-live-mate_compiz.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Mate'
},
{
'name': 'Fedora-LXQt-Live',
'kickstart': 'fedora-live-lxqt.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'LXQt'
}
],
'^Labs$': [
{
'name': 'Fedora-Astronomy_KDE-Live',
'kickstart': 'fedora-live-astronomy_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Astronomy_KDE'
},
{
'name': 'Fedora-Design_suite-Live',
'kickstart': 'fedora-live-design_suite.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Design_suite'
},
{
'name': 'Fedora-Scientific_KDE-Live',
'kickstart': 'fedora-live-scientific_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Scientific_KDE'
},
{
'name': 'Fedora-Games-Live',
'kickstart': 'fedora-live-games.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Games'
},
{
'name': 'Fedora-Security-Live',
'kickstart': 'fedora-live-security.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Security'
},
{
'name': 'Fedora-Jam_KDE-Live',
'kickstart': 'fedora-live-jam_kde.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Jam_KDE'
},
{
'name': 'Fedora-Robotics-Live',
'kickstart': 'fedora-live-robotics.ks',
'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Robotics'
},
{
'name': 'Fedora-Python-Classroom-Live',
'kickstart': 'fedora-live-python-classroom.ks',
'arches': ['x86_64', 'i386'],
'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 = 'f30'
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',
'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": "f30",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/30/${basearch}/silverblue",
"arches": ["x86_64"],
"failable": ['*'],
}
}
ostree_installer = [
("^Silverblue$", {
"x86_64": {
"repo": "Everything",
"release": None,
"rootfs_size": "8",
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
"ostree-based-installer/lorax-embed-repo.tmpl"],
"add_template_var": [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org",
"ostree_osname=fedora",
"ostree_oskey=fedora-30-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/30/x86_64/silverblue",
"ostree_update_ref=fedora/30/x86_64/silverblue",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'f30',
'failable': ['*'],
}
})
]
koji_profile = 'compose_koji'

View File

@ -1,7 +1,7 @@
# PRODUCT INFO
release_name = 'Fedora'
release_short = 'Fedora'
release_version = 'Rawhide'
release_version = '30'
release_is_layered = False
# GENERAL SETTINGS
@ -10,13 +10,13 @@ comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-rawhide.xml',
'command': 'make comps-rawhide.xml'
'file': 'comps-f30.xml',
'command': 'make comps-f30.xml'
}
module_defaults_dir = {
'scm': 'git',
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
'branch': 'master',
'branch': 'f30',
'dir': '.'
}
@ -92,6 +92,9 @@ media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(arch
#jigdo
create_jigdo = False
# CREATEISO
iso_hfs_ppc64le_compatible = False
# BUILDINSTALL
buildinstall_method = 'lorax'
buildinstall_skip = [
@ -297,13 +300,13 @@ disc_types = {
}
translate_paths = [
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
('/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?#HEAD'
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f30'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = 'Rawhide'
global_version = '30'
# live_images ignores this in favor of live_target
global_target = 'f30'
@ -424,7 +427,7 @@ image_build = {
'kickstart': 'fedora-disk-minimal.ks',
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['aarch64'],
'arches': ['armhfp', 'aarch64'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Minimal',
@ -440,7 +443,7 @@ image_build = {
'kickstart': 'fedora-disk-workstation.ks',
'distro': 'Fedora-22',
'disk_size': 11,
'arches': ['aarch64'],
'arches': ['armhfp', 'aarch64'],
'repo': 'Workstation',
'install_tree_from': 'Workstation',
'subvariant': 'Workstation',
@ -456,7 +459,7 @@ image_build = {
'kickstart': 'fedora-disk-server.ks',
'distro': 'Fedora-22',
'disk_size': 7,
'arches': ['aarch64'],
'arches': ['armhfp', 'aarch64'],
'repo': 'Server',
'install_tree_from': 'Server',
'subvariant': 'Server',
@ -730,11 +733,11 @@ ostree = {
"force_new_commit": True,
"treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "master",
"config_branch": "f30",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/silverblue",
"ostree_ref": "fedora/30/${basearch}/silverblue",
"arches": ["x86_64"],
"failable": ['*'],
}
@ -751,14 +754,14 @@ ostree_installer = [
"add_template_var": [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org",
"ostree_osname=fedora-workstation",
"ostree_osname=fedora",
"ostree_oskey=fedora-30-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/30/x86_64/silverblue",
"ostree_update_ref=fedora/30/x86_64/silverblue",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
'template_branch': 'f30',
'failable': ['*'],
}
})

View File

@ -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="30"
RELEASE_TITLE="30"
COMPSFILE="comps-f30.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 i386 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!)
@ -189,7 +189,7 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC
# sync Silverblue to the unified ostree repo
for arch in x86_64; do
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/rawhide/${arch}/silverblue"
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/30/${arch}/silverblue"
ostree summary -u --repo=$OSTREEDESTREPO # update summary file
done

View File

@ -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/30"
#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-f30.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