From 819d52f51a427cda886f2c130f8b0e966e9ca588 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Jan 15 2020 19:55:01 +0000 Subject: bake final configs for 8.1.1911 --- diff --git a/c8-cloud.conf b/c8-cloud.conf new file mode 100644 index 0000000..61dde9e --- /dev/null +++ b/c8-cloud.conf @@ -0,0 +1,66 @@ +from multilib import * +from include-excludes import * +from images import * + +release_name = 'CentOS-Cloud' +release_short = 'CentOS-Cloud' +release_version = '8' +release_is_layered = False + +skip_phases = ['buildinstall','productimg','pkgset','gather','extra_files','createrepo'] + + +variants_file = 'variants.xml' +sigkeys = ['8483C65D'] +hashed_directories = False + +tree_arches = ['i386', 'x86_64', 'ppc64le', 'aarch64'] +tree_variants = ['Cloud'] + +# 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" + +# GATHER +gather_prepopulate = "centos-packages.json" + +gather_method = { + "^(?!(AppStream|PowerTools)).*$":{ + "comps": "deps" + }, + "^(AppStream|PowerTools)$": "hybrid", +} + +# 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:centos:8,CentOS 8', '--revision=8.0.1905'] + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + +createiso_skip = [ + ('^BaseOS$', { + '*': True, + 'src': True + }), + ('^AppStream$', { + '*': True, + 'src': True + }), + ('^PowerTools$', { + '*': True, + 'src': True + }), +] + diff --git a/c8-stream-cloud.conf b/c8-stream-cloud.conf new file mode 100644 index 0000000..01c0012 --- /dev/null +++ b/c8-stream-cloud.conf @@ -0,0 +1,66 @@ +from multilib import * +from include-excludes import * +from stream-images-cloud import * + +release_name = 'CentOS-Stream-Cloud' +release_short = 'CentOS-Stream-Cloud' +release_version = '8' +release_is_layered = False + +skip_phases = ['buildinstall','productimg','pkgset','gather','extra_files','createrepo'] + + +variants_file = 'variants.xml' +sigkeys = ['8483C65D'] +hashed_directories = False + +tree_arches = ['i386', 'x86_64', 'ppc64le', 'aarch64'] +tree_variants = ['Cloud'] + +# 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" + +# GATHER +gather_prepopulate = "centos-packages.json" + +gather_method = { + "^(?!(AppStream|PowerTools)).*$":{ + "comps": "deps" + }, + "^(AppStream|PowerTools)$": "hybrid", +} + +# 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:centos:8,CentOS 8', '--revision=8.0.1905'] + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + +createiso_skip = [ + ('^BaseOS$', { + '*': True, + 'src': True + }), + ('^AppStream$', { + '*': True, + 'src': True + }), + ('^PowerTools$', { + '*': True, + 'src': True + }), +] + diff --git a/c8-stream-updates.conf b/c8-stream-updates.conf new file mode 100644 index 0000000..b89e07a --- /dev/null +++ b/c8-stream-updates.conf @@ -0,0 +1,3 @@ +from c8-stream import * + +release_type = 'updates' diff --git a/c8-stream.conf b/c8-stream.conf index 069f78f..03d5acd 100644 --- a/c8-stream.conf +++ b/c8-stream.conf @@ -1,6 +1,6 @@ from multilib import * from include-excludes import * -from stream-images import * +#from stream-images import * # PRODUCT INFO release_name = "CentOS Stream" @@ -55,7 +55,7 @@ pkgset_koji_module_tag = "modular-updates-candidate" filter_system_release_packages = False # GATHER -gather_prepopulate = "centos-packages.json" +gather_prepopulate = "centos-stream-packages.json" gather_method = { "^(?!(AppStream|PowerTools|CR)).*$":{ @@ -66,7 +66,7 @@ gather_method = { gather_backend = "dnf" check_deps = False -greedy_method = "all" +greedy_method = "none" repoclosure_backend = "dnf" # CREATEREPO diff --git a/c8-updates.conf b/c8-updates.conf new file mode 100644 index 0000000..cbd008d --- /dev/null +++ b/c8-updates.conf @@ -0,0 +1,3 @@ +from c8 import * +#from images import * +release_type = 'updates' diff --git a/c8.conf b/c8.conf index 8557957..5165223 100644 --- a/c8.conf +++ b/c8.conf @@ -1,6 +1,6 @@ from multilib import * from include-excludes import * -from images import * +#from images import * # PRODUCT INFO release_name = "CentOS Linux" @@ -104,11 +104,11 @@ buildinstall_skip = [ ] image_name_format = { - "^BaseOS$": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", - ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", + "^BaseOS$": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}", + ".*": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}", } -image_volid_formats = [ '{release_short}-{release_version}-{arch}-{disc_type}', ] +image_volid_formats = [ '{release_short}-8.1.1911-{arch}-{disc_type}', ] # CREATEISO create_optional_isos = False @@ -123,7 +123,7 @@ createiso_skip = [ extra_isos = { "BaseOS": [{ "include_variants": ["AppStream"], - "filename": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", + "filename": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}", "skip_src": True, }] } diff --git a/images-cloud.conf b/images-cloud.conf new file mode 100644 index 0000000..dfea1c2 --- /dev/null +++ b/images-cloud.conf @@ -0,0 +1,109 @@ +image_build = { + "(^BaseOS$|^Cloud$)": [ + { + "image-build": { + "format": [("docker", "tar.gz")], + "name": "CentOS-8-Container", + "subvariant": "container", + "version": "8.1.1911", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-Container.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "8", + "arches": ["x86_64","ppc64le","aarch64"], + "failable": ["ppc64le"], + "repo": [ + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + }, + "factory-parameters": { + "generate_icicle": False, + "docker_cmd": '[ "/bin/bash" ]', + "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8"}', + } + }, + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "CentOS-8-GenericCloud", + "subvariant": "generic", + "version": "8.1.1911", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-GenericCloud.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "8", + "arches": ["x86_64","ppc64le","aarch64"], + "repo": [ + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "CentOS-8-ec2", + "subvariant": "ec2", + "version": "8.1.1911", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-EC2.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "8", + "arches": ["x86_64", "aarch64"], + "repo": [ + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + { + "image-build": { + "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], + "name": "CentOS-8-Vagrant", + "subvariant": "vagrant", + "version": "8.1.1911", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-x86_64-Vagrant.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "8", + "arches": ["x86_64"], + "repo": [ + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + ] +} + +translate_paths = [ + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), +] diff --git a/images.conf b/images.conf index 753f914..dfea1c2 100644 --- a/images.conf +++ b/images.conf @@ -1,5 +1,5 @@ image_build = { - "^BaseOS$": [ + "(^BaseOS$|^Cloud$)": [ { "image-build": { "format": [("docker", "tar.gz")], @@ -12,17 +12,19 @@ image_build = { "kickstart": "CentOS-8-Container.ks", "ksversion": "F26", "distro": "Fedora-20", - "disk-size": "10", + "disk-size": "8", "arches": ["x86_64","ppc64le","aarch64"], "failable": ["ppc64le"], "repo": [ - 'BaseOS', - ], + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, "docker_cmd": '[ "/bin/bash" ]', - "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8-stream"}', + "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8"}', } }, { @@ -37,11 +39,13 @@ image_build = { "kickstart": "CentOS-8-GenericCloud.ks", "ksversion": "F26", "distro": "Fedora-20", - "disk-size": "10", + "disk-size": "8", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - 'BaseOS', - 'AppStream'], + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -59,11 +63,13 @@ image_build = { "kickstart": "CentOS-8-EC2.ks", "ksversion": "F26", "distro": "Fedora-20", - "disk-size": "10", - "arches": ["x86_64", "ppc64le", "aarch64"], + "disk-size": "8", + "arches": ["x86_64", "aarch64"], "repo": [ - 'BaseOS', - 'AppStream'], + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -73,7 +79,7 @@ image_build = { "image-build": { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "CentOS-8-Vagrant", - "subvariant": "stream-vagrant", + "subvariant": "vagrant", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -81,11 +87,13 @@ image_build = { "kickstart": "CentOS-8-x86_64-Vagrant.ks", "ksversion": "F26", "distro": "Fedora-20", - "disk-size": "10", + "disk-size": "8", "arches": ["x86_64"], "repo": [ - 'BaseOS', - 'AppStream'], + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", "failable": ["ppc64le","aarch64"], }, "factory-parameters": { diff --git a/include-excludes.conf b/include-excludes.conf index b5e6280..cd6ca8d 100644 --- a/include-excludes.conf +++ b/include-excludes.conf @@ -19,6 +19,7 @@ additional_packages = [ ("^AppStream$", { "*": [ "langpacks-*", + "dotnet-*", ] }), @@ -45,7 +46,7 @@ additional_packages = [ ("^BaseOS$", { "*": [ "kernel-doc", - ] + "centos-obsolete-packages", ], "armhfp": [ "kernel-lpae*", diff --git a/multilib.conf b/multilib.conf index 092fddb..54df92e 100644 --- a/multilib.conf +++ b/multilib.conf @@ -12,5 +12,6 @@ multilib_whitelist = { "*": [ "valgrind", "papi", + "ggc-toolset-9-valgrind", ], } diff --git a/stream-images-cloud.conf b/stream-images-cloud.conf new file mode 100644 index 0000000..10f1aa8 --- /dev/null +++ b/stream-images-cloud.conf @@ -0,0 +1,82 @@ +image_build = { + "^Cloud$": [ + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "CentOS-Stream-GenericCloud", + "subvariant": "stream-generic", + "version": "8", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-Stream-GenericCloud.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64","ppc64le","aarch64"], + "repo": [ + "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + { + "image-build": { + "format": [("qcow2", "qcow2")], + "name": "CentOS-Stream-ec2", + "subvariant": "stream-ec2", + "version": "8", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-Stream-EC2.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64", "ppc64le", "aarch64"], + "repo": [ + "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + { + "image-build": { + "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], + "name": "CentOS-Stream-Vagrant", + "subvariant": "stream-vagrant", + "version": "8", + "release": "!RELEASE_FROM_DATE_RESPIN" + "target": "image-centos-8", + "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-Stream-x86_64-Vagrant.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64"], + "repo": [ + "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + } + }, + ] +} + +translate_paths = [ + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), +]