From 518f4814d76beee01b45dabbb97b5b4d82cce50b Mon Sep 17 00:00:00 2001 From: Jan Kaluža Date: Sep 23 2020 12:46:30 +0000 Subject: Merge #884 `ELN: Try building Fedora-ELN qcow2 image.` Signed-off-by: Jan Kaluža --- diff --git a/fedora/override.conf b/fedora/override.conf index c94a94b..453342f 100644 --- a/fedora/override.conf +++ b/fedora/override.conf @@ -28,8 +28,15 @@ skip_phases = [ #"image_build" ] -# Build installer only from Everything x86_64. +# Build installer only from BaseOS x86_64. buildinstall_skip = [ + ('^BaseOS$', { + 'i386': True, + 'aarch64': True, + 'armhfp': True, + 'ppc64le': True, + 's390x': True + }), ('^Everything$', { 'i386': True, 'aarch64': True, @@ -37,15 +44,20 @@ buildinstall_skip = [ 'ppc64le': True, 's390x': True }), - ("^(Modular|AppStream|CRB|BaseOS|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", { + ("^(Modular|AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", { '*': True }), ] # Add the rawhide repository for missing packages +# TODO: Once we have all the packages built in ELN repos, +# we must remove this completely. lorax_extra_sources = [ ('^Everything$', { '*': 'https://kojipkgs.fedoraproject.org/repos/f33-build/latest/$basearch/', + }), + ('^BaseOS$', { + '*': ['https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/', 'https://kojipkgs.fedoraproject.org/repos/f33-build/latest/$basearch/'], }) ] @@ -68,7 +80,9 @@ lorax_options = [ }, '*': { 'noupgrade': True, - 'rootfs_size': 3 + 'rootfs_size': 3, + # This is used to use ELN lorax templates instead of Fedora ones. + 'configuration_file': 'lorax.conf' } }) ] @@ -110,9 +124,9 @@ image_build = { 'image-build': { 'format': [('docker', 'tar.xz')], 'name': 'Fedora-Container-Base', - 'kickstart': 'fedora-container-base.ks', + 'kickstart': 'fedora-eln-container-base.ks', 'distro': 'Fedora-22', - 'disk_size': 5, + 'disk_size': 10, 'arches': ['x86_64'], 'repo': 'Everything', 'install_tree_from': 'Everything', @@ -126,6 +140,26 @@ image_build = { 'docker_label': '{ "name": "fedora-eln", "license": "MIT", "vendor": "Fedora Project", "version": "9"}', }, }, - ], + ], + "^BaseOS$": [ + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "Fedora-ELN-Guest", + "version": "9.0", + "kickstart": "fedora-eln-guest.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64"], + 'install_tree_from': 'BaseOS', + "repo": ["BaseOS","AppStream","Everything"] + "failable": ["*"], + }, + "factory-parameters": { + "generate_icicle": False, + } + } + ] } diff --git a/lorax.conf b/lorax.conf new file mode 100644 index 0000000..be7fd85 --- /dev/null +++ b/lorax.conf @@ -0,0 +1,2 @@ +[lorax] +sharedir = /srv/odcs/lorax-templates/templates.d/80-rhel/