From f135792d3e6a5878a1af3dfdb1251a01053f2f24 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Jun 16 2020 21:21:13 +0000 Subject: update the devel variant in its own compose --- diff --git a/c8-devel.conf b/c8-devel.conf new file mode 100644 index 0000000..c9726da --- /dev/null +++ b/c8-devel.conf @@ -0,0 +1,152 @@ +from multilib import * +from include-excludes import * +from stream-images import * + +# PRODUCT INFO +release_name = "CentOS Developmental" +release_short = "CentOS-devel" +release_version = "8" +version = "8-devel" + +skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files'] + +# GENERAL SETTINGS + comps_file = { + 'scm': 'git', + 'repo': 'https://git.centos.org/centos/comps.git', + 'branch': 'master', + 'file': 'comps-centos-8.2.0.2004.xml', + } + +link_type = 'hardlink-or-copy' + +module_defaults_dir = { + 'scm': 'git', + 'repo': 'https://git.centos.org/centos/centos-module-defaults.git', + 'branch': 'c8.2', + 'dir': '.', +} + +multilib = [ + ('^.*$', { + 'x86_64': ['devel', 'runtime'] + }), +] + +variants_file = 'variants-devel.xml' +sigkeys = ['8483C65D'] +hashed_directories = False + +# tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] +tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] +# tree_arches = ['x86_64'] + +# PKGSET +pkgset_source = "koji" +koji_profile = "mbox" + +# PKGSET - KOJI +pkgset_koji_tag = "dist-c8-compose" +pkgset_koji_inherit = False +pkgset_koji_module_tag = "modular-updates-candidate" + +filter_system_release_packages = False + +# GATHER +gather_prepopulate = "centos-packages.json" + +gather_method = { + "^(?!(AppStream|PowerTools|CR)).*$":{ + "comps": "deps" + }, + "^(AppStream|PowerTools|CR)$": "hybrid", +} + +gather_backend = "dnf" +check_deps = False +greedy_method = "none" +repoclosure_backend = "dnf" + +# CREATEREPO +createrepo_deltas = False +createrepo_database = True +createrepo_c = True +createrepo_checksum = "sha256" +createrepo_use_xz = True +createrepo_num_threads = 8 +createrepo_num_workers = 4 + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + + +buildinstall_skip = [ + ("^(Devel|AppStream|PowerTools|CR|HighAvailability)$", { + "*": True + }), +] + +# LOOKASIDE +variant_as_lookaside = [ +] + +gather_lookaside_repos = [ + ("^Devel$", { + "x86_64": [ + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/x86_64/os", + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/x86_64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/x86_64/os", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/x86_64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/x86_64/os", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/x86_64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/x86_64/os", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/x86_64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/source/tree", + ], + "ppc64": [ + ], + "ppc64le": [ + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/ppc64le/os", + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/ppc64le/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/ppc64le/os", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/ppc64le/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/ppc64le/os", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/ppc64le/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/ppc64le/os", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/ppc64le/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/source/tree", + ], + "s390x": [ + ], + "aarch64": [ + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/aarch64/os", + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/aarch64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/BaseOS/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/aarch64/os", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/aarch64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/AppStream/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/aarch64/os", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/aarch64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/PowerTools/source/tree", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/aarch64/os", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/aarch64/os/debug/tree", + "file:///compose/trees/latest-CentOS-8/compose/HighAvailability/source/tree", + ], + }), +] + +productimg = False + +translate_paths = [ + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + # ("/compose", "http://172.22.0.123/compose"), +] + diff --git a/c8-stream-devel.conf b/c8-stream-devel.conf deleted file mode 100644 index 54d0ebc..0000000 --- a/c8-stream-devel.conf +++ /dev/null @@ -1,201 +0,0 @@ -from multilib import * -from include-excludes import * -from stream-images import * - -# PRODUCT INFO -release_name = "CentOS Stream Developmental" -release_short = "CentOS-devel" -release_version = "Stream" -version = "8-devel" - -# # GENERAL SETTINGS -# comps_file = { -# 'scm': 'git', -# 'repo': 'https://git.centos.org/centos/comps.git', -# 'branch': 'master', -# 'file': 'comps-centos-8-stream.xml', -# } -comps_file = 'comps-centos-8-stream-devel.xml' - -link_type = 'hardlink-or-copy' - -module_defaults_dir = { - 'scm': 'git', - 'repo': 'https://git.centos.org/centos/centos-module-defaults.git', - 'branch': 'c8.2', - 'dir': '.', -} - -multilib = [ - ('^.*$', { - 'x86_64': ['devel', 'runtime'] - }), -] - -variants_file = 'variants-devel.xml' -sigkeys = ['8483C65D', None] -hashed_directories = False - -# tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] -tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] -# tree_arches = ['x86_64'] - -# RUNROOT SETTINGS -runroot_channel = 'image' -runroot_tag = 'dist-c8-build' -runroot_method = 'koji' - -# PKGSET -pkgset_source = "koji" -koji_profile = "mbox" - -# PKGSET - KOJI -pkgset_koji_tag = "dist-c8-stream-compose" -pkgset_koji_inherit = False -pkgset_koji_module_tag = "modular-updates-candidate" - -filter_system_release_packages = False - -# GATHER -gather_prepopulate = "centos-packages.json" - -gather_method = { - "^(?!(AppStream|PowerTools|CR)).*$":{ - "comps": "deps" - }, - "^(AppStream|PowerTools|CR)$": "hybrid", -} - -gather_backend = "dnf" -check_deps = False -greedy_method = "all" -repoclosure_backend = "dnf" - -# CREATEREPO -createrepo_deltas = False -createrepo_database = True -createrepo_c = True -createrepo_checksum = "sha256" -createrepo_use_xz = True -createrepo_num_threads = 8 -createrepo_num_workers = 4 -createrepo_extra_args = ['--distro=cpe:/o:centos-stream:centos-stream:8,CentOS Stream 8', '--revision=8-stream'] - -# CHECKSUMS -media_checksums = ['sha256'] -media_checksum_one_file = True -create_jigdo = False - -# BUILDINSTALL -bootable = True -buildinstall_method = "lorax" - -lorax_options = [ - ("^.*$", { - "*": { - "noupgrade": False, - "rootfs_size": 3, - "version": "8-stream" - } - }) -] - -buildinstall_skip = [ - ("^(Devel|AppStream|PowerTools|CR|HighAvailability)$", { - "*": True - }), -] - -image_name_format = { - "^BaseOS$": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", - ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", -} - -image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ] - -# CREATEISO -create_optional_isos = False - -createiso_skip = [ - ('^(Devel|AppStream|PowerTools|HighAvailability|CR)$', { - '*': True, - 'src':True - }), -] - -extra_isos = { - "BaseOS": [{ - "include_variants": ["AppStream"], - "filename": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", - "skip_src": True, - }, - ] -} - -restricted_volid = True - -# LOOKASIDE -variant_as_lookaside = [ -# ('AppStream', 'BaseOS'), -# ('PowerTools', 'BaseOS'), -# ('PowerTools', 'AppStream'), -] - -gather_lookaside_repos = [ - ("^Devel$", { - "x86_64": [ - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/x86_64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/x86_64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/x86_64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/x86_64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/x86_64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/x86_64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/x86_64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/x86_64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/source/tree", - ], - "ppc64": [ - ], - "ppc64le": [ - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/ppc64le/os", - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/ppc64le/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/ppc64le/os", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/ppc64le/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/ppc64le/os", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/ppc64le/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/ppc64le/os", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/ppc64le/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/source/tree", - ], - "s390x": [ - ], - "aarch64": [ - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/aarch64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/aarch64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/BaseOS/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/aarch64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/aarch64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/AppStream/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/aarch64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/aarch64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/PowerTools/source/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/aarch64/os", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/aarch64/os/debug/tree", - "file:///compose/trees/latest-CentOS-Stream/compose/HighAvailability/source/tree", - ], - }), -] - -productimg = False - -translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - # ("/compose", "http://172.22.0.123/compose"), -] -