From 2df03b83983e2ac3cc892f6695615f305f5cc143 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Dec 16 2019 17:36:11 +0000 Subject: get armhfp ready for 8.1 --- diff --git a/c8-armhfp.conf b/c8-armhfp.conf index 1cae025..0ba0f9a 100644 --- a/c8-armhfp.conf +++ b/c8-armhfp.conf @@ -1,20 +1,19 @@ from multilib import * from include-excludes import * -from images-armhfp import * +#from images-armhfp import * # PRODUCT INFO -release_name = "CentOS Linux" -release_short = "CentOS" +release_name = "CentOS Altarch" +release_short = "CentOS-Altarch" release_version = "8" release_is_layered = False # GENERAL SETTINGS -bootable = True comps_file = { 'scm': 'git', 'repo': 'https://git.centos.org/centos/comps.git', 'branch': 'master', - 'file': 'comps-centos-8.0.0.1905.xml', + 'file': 'comps-centos-8.1.0.1911.xml', } link_type = 'hardlink-or-copy' @@ -22,7 +21,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': '.', } @@ -35,7 +34,6 @@ hashed_directories = False tree_arches = ['armv7hl'] # RUNROOT SETTINGS -runroot = True runroot_channel = 'image' runroot_tag = 'dist-c8-build' runroot_method = 'koji' @@ -45,7 +43,8 @@ pkgset_source = "koji" koji_profile = "mbox" # PKGSET - KOJI -pkgset_koji_tag = "dist-c8" +pkgset_koji_tag = "dist-c8-compose" +pkgset_koji_inherit = False pkgset_koji_module_tag = "modular-updates-candidate" filter_system_release_packages = False @@ -54,10 +53,10 @@ filter_system_release_packages = False gather_prepopulate = "centos-packages.json" gather_method = { - "^(?!(AppStream|Devel)).*$":{ + "^(?!(AppStream|PowerTools|CR)).*$":{ "comps": "deps" }, - "^(AppStream|Devel)$": "hybrid", + "^(AppStream|PowerTools|CR)$": "hybrid", } gather_backend = "dnf" @@ -70,6 +69,10 @@ 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.1.1911'] # CHECKSUMS media_checksums = ['sha256'] @@ -84,27 +87,30 @@ lorax_options = [ ("^.*$", { "*": { "noupgrade": False, - "rootfs_size": 3 + "rootfs_size": 3, + "version": "8" } }) ] buildinstall_skip = [ - ("^(AppStream|Devel)$", { + ("^(AppStream|PowerTools|CR|HighAvailability)$", { "*": True }), ] image_name_format = { - "^BaseOS$": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}", - ".*": "{compose_id}-{variant}-{arch}-{disc_type}{disc_num}{suffix}", + "^BaseOS$": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", + ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", } +image_volid_formats = [ '{release_short}-{release_version}-{arch}-{disc_type}', ] + # CREATEISO create_optional_isos = False createiso_skip = [ - ('^(BaseOS|AppStream|Devel|)$', { + ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', { '*': True, 'src':True }), @@ -113,8 +119,8 @@ createiso_skip = [ extra_isos = { "BaseOS": [{ "include_variants": ["AppStream"], - "filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}", - "skip_src": False, + "filename": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}", + "skip_src": True, }] } @@ -123,8 +129,10 @@ restricted_volid = True # LOOKASIDE variant_as_lookaside = [ ('AppStream', 'BaseOS'), - ('Devel', 'BaseOS'), - ('Devel', 'AppStream'), + ('PowerTools', 'BaseOS'), + ('PowerTools', 'AppStream'), + ('HighAvailability', 'BaseOS'), + ('HighAvailability', 'AppStream'), ] productimg = False diff --git a/images-armhfp.conf b/images-armhfp.conf index b030674..f3ecdd3 100644 --- a/images-armhfp.conf +++ b/images-armhfp.conf @@ -3,9 +3,10 @@ image_build = { { "image-build": { "format": [("qcow2", "qcow2")], - "name": "CentOS-8-GenericCloud", + "name": "CentOS-8-Altarch-GenericCloud", "target": "image-centos-8", - "version": "8.0.1905", + "version": "8.1.1911", + "release": "!RELEASE_FROM_DATE_RESPIN" "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD", "kickstart": "CentOS-8-GenericCloud.ks", "ksversion": "F26", @@ -13,7 +14,7 @@ image_build = { "disk-size": "10", "arches": ["armv7hl"], "repo": ["BaseOS", "AppStream"], - "failable": [], + "failable": [*], }, "factory-parameters": { "generate_icicle": False, @@ -22,9 +23,10 @@ image_build = { { "image-build": { "format": [("docker", "tar.gz")], - "name": "CentOS-8-Container", + "name": "CentOS-8-Altarch-Container", "target": "image-centos-8", - "version": "8.0.1905", + "version": "8.1.1911", + "release": "!RELEASE_FROM_DATE_RESPIN" "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD", "kickstart": "CentOS-8-Container.ks", "ksversion": "F26", @@ -32,7 +34,7 @@ image_build = { "disk-size": "10", "arches": ["armv7hl"], "repo": ["BaseOS", "AppStream"], - "failable": [], + "failable": [*], }, "factory-parameters": { "generate_icicle": False, diff --git a/variants-armhfp.xml b/variants-armhfp.xml index 003f5aa..d26fe5e 100644 --- a/variants-armhfp.xml +++ b/variants-armhfp.xml @@ -166,12 +166,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 @@ -181,6 +184,7 @@ redis:5 rhn-tools:1.0 ruby:2.5 + ruby:2.6 rust-toolset:rhel8 satellite-5-client:1.0 scala:2.10 @@ -194,13 +198,13 @@ - - + + armv7hl - centos-devel + centos-powertools