From 29a7b77e60f206cf031fb5826abfcb5ec1956da7 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Nov 27 2019 17:17:38 +0000 Subject: some tweaks to enable images --- diff --git a/c8-stream.conf b/c8-stream.conf index e0e57dc..34824ec 100644 --- a/c8-stream.conf +++ b/c8-stream.conf @@ -1,12 +1,11 @@ from multilib import * from include-excludes import * -#from images import * +from images import * from version import * # PRODUCT INFO release_name = "CentOS Stream" release_short = "CentOS" -release_type = "updates" release_version = "Stream" release_is_layered = False version = "8" @@ -25,7 +24,7 @@ link_type = 'hardlink-or-copy' module_defaults_dir = { 'scm': 'git', 'repo': 'https://git.centos.org/centos/centos-module-defaults.git', - 'branch': 'c8.0', + 'branch': 'c8.1', 'dir': '.', } @@ -36,7 +35,7 @@ multilib = [ ] variants_file = 'variants.xml' -sigkeys = ['8483C65D'] +sigkeys = [None] hashed_directories = False tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] @@ -81,7 +80,7 @@ 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'] +createrepo_extra_args = ['--distro=cpe:/o:centos-stream:centos-stream:8,CentOS Stream 8', '--revision=8.1.1911'] # CHECKSUMS media_checksums = ['sha256'] @@ -97,7 +96,7 @@ lorax_options = [ "*": { "noupgrade": False, "rootfs_size": 3, - "version": "8.0.1905" + "version": "8-stream" } }) ] @@ -113,6 +112,8 @@ image_name_format = { ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", } +image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ] + # CREATEISO create_optional_isos = False diff --git a/images.conf b/images.conf index b5fc1d7..f52cfc0 100644 --- a/images.conf +++ b/images.conf @@ -1,68 +1,3 @@ -from multilib import * -from include-excludes 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'] -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 - }), -] - image_build = { "^Cloud$": [ { @@ -70,7 +5,8 @@ image_build = { "format": [("qcow2", "qcow2")], "name": "CentOS-8-GenericCloud", "target": "image-centos-8", - "version": "8.0.1905", + "version": "8.1.1911", + "release": None, "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD", "kickstart": "CentOS-8-GenericCloud.ks", "ksversion": "F26", @@ -78,9 +14,8 @@ image_build = { "disk-size": "10", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', - 'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'], - "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', + 'BaseOS', + 'AppStream'], "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -92,7 +27,8 @@ image_build = { "format": [("qcow2", "qcow2")], "name": "CentOS-8-ec2", "target": "image-centos-8", - "version": "8.0.1905", + "version": "8.1.1911", + "release": None, "ksurl": "git+https://git.centos.org/forks/davdunc/centos/kickstarts.git?#6f0660635fad0eb2e8d02219c56036d2035b24a3", "kickstart": "CentOS-8-EC2.ks", "ksversion": "F26", @@ -100,9 +36,8 @@ image_build = { "disk-size": "10", "arches": ["x86_64"], "repo": [ - 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', - 'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'], - "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', + 'BaseOS', + 'AppStream'], "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -114,7 +49,8 @@ image_build = { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "CentOS-8-Vagrant", "target": "image-centos-8", - "version": "8.0.1905", + "version": "8.1.1911", + "release": None, "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD", "kickstart": "CentOS-8-x86_64-Vagrant.ks", "ksversion": "F26", @@ -122,9 +58,8 @@ image_build = { "disk-size": "10", "arches": ["x86_64"], "repo": [ - 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', - 'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'], - "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', + 'BaseOS', + 'AppStream'], "failable": ["ppc64le","aarch64"], }, "factory-parameters": { diff --git a/variants.xml b/variants.xml index bb371a1..1f0304e 100644 --- a/variants.xml +++ b/variants.xml @@ -38,6 +38,7 @@ mainframe-access multimedia dns-server + smart-card smb-server network-tools network-file-system-client @@ -170,12 +171,15 @@ mod_auth_openidc:2.3 mysql:8.0 nginx:1.14 + nginx:1.16 nodejs:10 + nodejs:12 parfait:0.5 perl:5.24 perl:5.26 perl-FCGI:0.78 php:7.2 + php:7.3 pki-core:10.6 pki-deps:10.6 postgresql:10 @@ -185,6 +189,7 @@ redis:5 rhn-tools:1.0 ruby:2.5 + rust-toolset:rhel8 satellite-5-client:1.0 scala:2.10 @@ -198,8 +203,8 @@ - - + + aarch64 ppc64le @@ -215,13 +220,29 @@ used as lookaside for CRB, so the module will not actually get into CRB, but it's needed here for creating the -devel module. --> + - + + + + + + + +