ALBS-1073: Prepare new configs of the building artifacts generator for all arches for 8.8-beta & 9.2-beta

- AL 9.2-beta is coming
This commit is contained in:
soksanichenko 2023-03-30 15:21:35 +03:00
parent f43d879cd8
commit 68476e5407
13 changed files with 28456 additions and 16 deletions

13633
i686/comps.xml Normal file

File diff suppressed because it is too large Load Diff

5
i686/extra_options.conf Normal file
View File

@ -0,0 +1,5 @@
skip_phases = [
'buildinstall',
'createiso',
'extra_isos',
]

135
i686/include_exclude.conf Normal file
View File

@ -0,0 +1,135 @@
filter_packages = [
(
'^(BaseOS|Minimal|AppStream|CRB)$', {
'*': [
"insights-client",
"libreport-plugin-rhtsupport",
"libreport-rhel",
"libreport-rhel-anaconda-bugzilla",
"libreport-rhel-bugzilla",
"redhat-backgrounds",
"redhat-logos",
"redhat-logos-httpd",
"redhat-logos-ipa",
"redhat-release-eula",
"redhat-support-lib-python",
"redhat-support-tool",
"spice-client-win-x64",
"spice-client-win-x86",
"spice-qxl-wddm-dod",
"spice-vdagent-win-x64",
"spice-vdagent-win-x86",
"virt-who",
"virtio-win",
"subscription-manager-cockpit",
"subscription-manager-initial-setup-addon",
"rhsm-gtk",
"rhsm-icons",
"rhc",
"rhc-worker-playbook",
"python2-gluster*",
"gcc-toolset-10-dyninst-devel.i686",
"gcc-toolset-10-systemtap-devel.i686",
"gcc-toolset-10-systemtap-sdt-devel.i686",
"ocaml-camlp4.i686",
"ocaml-camlp4-devel.i686",
"ocaml-extlib-devel.i686",
"ocaml-findlib-devel.i686",
"ocaml-labltk.i686",
"ocaml-labltk-devel.i686",
"ocaml-ocamlbuild.i686",
"ocaml-ocamlbuild-devel.i686",
"greenboot-grub2",
"greenboot-reboot",
"greenboot-rpm-ostree-grub2",
"greenboot-status",
"qemu-kvm-hw-usbredir",
]
}
),
(
'^(BaseOS|Minimal)$', {
'*': [
"perl-Net-SSLeay",
"perl-Mozilla-CA",
"perl-IO-Socket-SSL",
"python-unversioned-command",
"python.i686",
]
}
),
(
'^(AppStream)$', {
'*': [
"java-1.8.0-openjdk-slowdebug",
"java-1.8.0-openjdk-headless-slowdebug",
"libvirt-glib.i686",
"sos",
]
}
),
(
'^(extras)$', {
'*': [
"centos-release-*",
]
}
)
]
filter_modules = []
additional_packages = [
(
'^AppStream$', {
'*': [
"almalinux-backgrounds",
]
}
),
(
'^Minimal$', {
'*': [
"aide",
"audispd-plugins",
"audit",
"chrony",
"crypto-policies",
"dnf-automatic",
"fapolicyd",
"firewalld",
"gnutls-utils",
"kernel-modules-extra",
"libreswan",
"libselinux",
"libsss_sudo",
"opensc",
"openscap",
"openscap-scanner",
"openssh-clients",
"openssh-server",
"openssl-pkcs11",
"pcsc-lite",
"policycoreutils",
"policycoreutils-python-utils",
"python3-libselinux",
"rear",
"rng-tools",
"rsyslog",
"rsyslog-gnutls",
"scap-security-guide",
"subscription-manager",
"sudo",
"tmux",
"usbguard",
"kernel",
]
}
),
(
'^extras$', {
'*': [
"anaconda-live",
]
}
)
]

View File

@ -0,0 +1,7 @@
data:
module: maven
profiles:
'3.8':
- common
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,7 @@
data:
module: nodejs
profiles:
'18':
- common
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,7 @@
data:
module: php
profiles:
'8.1':
- common
document: modulemd-defaults
version: '1'

View File

@ -0,0 +1,7 @@
data:
module: ruby
profiles:
'3.1':
- common
document: modulemd-defaults
version: '1'

3
i686/multilib.conf Normal file
View File

@ -0,0 +1,3 @@
multilib_blacklist = {}
multilib_whitelist = {}
multilib = []

14268
i686/packages.json Normal file

File diff suppressed because it is too large Load Diff

245
i686/variants.xml Normal file
View File

@ -0,0 +1,245 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE variants PUBLIC "-//AlmaLinux//DTD Variants info//EN" "variants2012.dtd">
<variants>
<variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">additional-devel</group>
<group default="false">anaconda-tools</group>
<group default="false">base</group>
<group default="false">conflicts-baseos</group>
<group default="false">core</group>
<group default="false">development</group>
<group default="false">dial-up</group>
<group default="false">file-server</group>
<group default="false">fonts</group>
<group default="false">gnome-desktop</group>
<group default="false">graphical-admin-tools</group>
<group default="false">hardware-monitoring</group>
<group default="false">hardware-support</group>
<group default="false">headless-management</group>
<group default="false">infiniband</group>
<group default="false">large-systems</group>
<group default="false">legacy-unix</group>
<group default="false">mail-server</group>
<group default="false">mainframe-access</group>
<group default="false">network-file-system-client</group>
<group default="false">network-server</group>
<group default="false">network-tools</group>
<group default="false">networkmanager-submodules</group>
<group default="false">performance</group>
<group default="false">python-web</group>
<group default="false">remote-system-management</group>
<group default="false">scientific</group>
<group default="false">security-tools</group>
<group default="false">server-product</group>
<group default="false">smart-card</group>
<group default="false">smb-server</group>
<group default="false">standard</group>
<group default="false">system-tools</group>
<group default="false">workstation-product</group>
</groups>
<environments>
<environment display_order="99">custom-environment</environment>
<environment display_order="3">minimal-environment</environment>
<environment display_order="2">server-product-environment</environment>
</environments>
</variant>
<variant id="AppStream" name="AppStream" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">additional-devel</group>
<group default="false">anaconda-tools</group>
<group default="false">backup-client</group>
<group default="false">base</group>
<group default="false">base-x</group>
<group default="false">conflicts-appstream</group>
<group default="false">console-internet</group>
<group default="false">container-management</group>
<group default="false">core</group>
<group default="false">debugging</group>
<group default="false">desktop-debugging</group>
<group default="false">development</group>
<group default="false">dns-server</group>
<group default="false">dotnet</group>
<group default="false">emacs</group>
<group default="false">file-server</group>
<group default="false">fonts</group>
<group default="false">ftp-server</group>
<group default="false">gnome-apps</group>
<group default="false">gnome-desktop</group>
<group default="false">graphical-admin-tools</group>
<group default="false">graphics</group>
<group default="false">guest-agents</group>
<group default="false">guest-desktop-agents</group>
<group default="false">hardware-monitoring</group>
<group default="false">headless-management</group>
<group default="false">infiniband</group>
<group default="false">input-methods</group>
<group default="false">internet-applications</group>
<group default="false">internet-browser</group>
<group default="false">java-development</group>
<group default="false">java-platform</group>
<group default="false">legacy-x</group>
<group default="false">mail-server</group>
<group default="false">multimedia</group>
<group default="false">network-file-system-client</group>
<group default="false">network-server</group>
<group default="false">network-tools</group>
<group default="false">networkmanager-submodules</group>
<group default="false">office-suite</group>
<group default="false">ostree-support</group>
<group default="false">performance</group>
<group default="false">platform-devel</group>
<group default="false">platform-kvm</group>
<group default="false">platform-microsoft</group>
<group default="false">platform-vmware</group>
<group default="false">print-client</group>
<group default="false">remote-desktop-clients</group>
<group default="false">remote-system-management</group>
<group default="false">rpm-development-tools</group>
<group default="false">scientific</group>
<group default="false">security-tools</group>
<group default="false">smart-card</group>
<group default="false">smb-server</group>
<group default="false">standard</group>
<group default="false">system-tools</group>
<group default="false">texlive</group>
<group default="false">virtualization-client</group>
<group default="false">virtualization-hypervisor</group>
<group default="false">virtualization-platform</group>
<group default="false">virtualization-tools</group>
<group default="false">web-server</group>
<group default="false">workstation-product</group>
</groups>
<environments>
<environment display_order="99">custom-environment</environment>
<environment display_order="1">graphical-server-environment</environment>
<environment display_order="3">minimal-environment</environment>
<environment display_order="2">server-product-environment</environment>
<environment display_order="99">virtualization-host-environment</environment>
<environment display_order="4">workstation-product-environment</environment>
</environments>
<modules>
<module>maven:3.8</module>
<module>nodejs:18</module>
<module>php:8.1</module>
<module>ruby:3.1</module>
</modules>
</variant>
<variant id="CRB" name="CRB" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">crb</group>
</groups>
</variant>
<variant id="HighAvailability" name="HighAvailability" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">ha</group>
<group default="true">ha-devel</group>
</groups>
</variant>
<variant id="ResilientStorage" name="ResilientStorage" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">ha</group>
<group default="true">ha-devel</group>
<group default="true">resilient-storage</group>
</groups>
</variant>
<variant id="NFV" name="NFV" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">nfv</group>
<group default="false">nfv-debug</group>
<group default="false">rt</group>
<group default="false">rt-debug</group>
</groups>
</variant>
<variant id="RT" name="RT" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">rt</group>
<group default="false">rt-debug</group>
</groups>
</variant>
<variant id="SAP" name="SAP" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">sap</group>
</groups>
</variant>
<variant id="SAPHANA" name="SAPHANA" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">sap-hana</group>
</groups>
</variant>
<variant id="extras" name="extras" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
</variant>
<variant id="Minimal" name="Minimal" type="variant">
<arches>
<arch>x86_64</arch>
</arches>
<groups>
<group default="false">additional-devel</group>
<group default="false">anaconda-tools</group>
<group default="false">base</group>
<group default="false">conflicts-baseos</group>
<group default="false">core</group>
<group default="false">development</group>
<group default="false">dial-up</group>
<group default="false">file-server</group>
<group default="false">fonts</group>
<group default="false">gnome-desktop</group>
<group default="false">hardware-monitoring</group>
<group default="false">hardware-support</group>
<group default="false">headless-management</group>
<group default="false">infiniband</group>
<group default="false">large-systems</group>
<group default="false">legacy-unix</group>
<group default="false">mail-server</group>
<group default="false">mainframe-access</group>
<group default="false">network-file-system-client</group>
<group default="false">network-server</group>
<group default="false">network-tools</group>
<group default="false">networkmanager-submodules</group>
<group default="false">performance</group>
<group default="false">python-web</group>
<group default="false">remote-system-management</group>
<group default="false">scientific</group>
<group default="false">security-tools</group>
<group default="false">server-product</group>
<group default="false">smart-card</group>
<group default="false">smb-server</group>
<group default="false">standard</group>
<group default="false">system-tools</group>
<group default="false">workstation-product</group>
</groups>
<environments>
<environment display_order="3">minimal-environment</environment>
</environments>
</variant>
</variants>

112
i686/variants_options.json Normal file
View File

@ -0,0 +1,112 @@
{
"BaseOS": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"AppStream": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS"
]
},
"CRB": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream"
]
},
"HighAvailability": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream"
]
},
"ResilientStorage": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream"
]
},
"Minimal": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"NFV": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream"
]
},
"RT": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream"
]
},
"SAP": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream",
"HighAvailability"
]
},
"SAPHANA": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream",
"HighAvailability"
]
},
"extras": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream"
]
},
"devel": {
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
"BaseOS",
"AppStream",
"CRB",
"SAP",
"SAPHANA",
"extras",
"Minimal",
"RT",
"NFV",
"ResilientStorage",
"HighAvailability"
]
}
}

View File

@ -1,17 +1,23 @@
{% set full_version = distribution_major_version + "." + distribution_minor_version %}
{% set branch = "a" + full_version + beta_suffix if beta_suffix is defined and beta_suffix else "" %}
from include_exclude import * from include_exclude import *
from multilib import * from multilib import *
{% if extra_options %}
from extra_options import *
{% endif %}
# PRODUCT INFO # PRODUCT INFO
release_name = "{{ product_name }}" release_name = "{{ product_name }}"
release_short = "{{ product_name }}" release_short = "{{ product_name }}"
release_version = "{{ distribution_major_version }}.{{ distribution_minor_version }}" release_version = "{{ full_version }}"
treeinfo_version = "{{ distribution_major_version }}" treeinfo_version = "{{ distribution_major_version }}"
# GENERAL SETTINGS # GENERAL SETTINGS
comps_file = { comps_file = {
"scm": "git", "scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git", "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}", "branch": "{{ branch }}",
"file": "{{ arch }}/comps.xml", "file": "{{ arch }}/comps.xml",
} }
@ -20,19 +26,23 @@ link_type = 'hardlink'
module_defaults_dir = { module_defaults_dir = {
"scm": "git", "scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git", "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}", "branch": "{{ branch }}",
"dir": "{{ arch }}/modules_defaults/module_defaults", "dir": "{{ arch }}/modules_defaults/module_defaults",
} }
variants_file = { variants_file = {
"scm": "git", "scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git", "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}", "branch": "{{ branch }}",
"file": "{{ arch }}/variants.xml", "file": "{{ arch }}/variants.xml",
} }
hashed_directories = False hashed_directories = False
{% if arch == 'x86_64' %}
tree_arches = ['{{ arch }}', 'i686']
{% else %}
tree_arches = ['{{ arch }}'] tree_arches = ['{{ arch }}']
{% endif %}
# PKGSET # PKGSET
pkgset_source = "kojimock" pkgset_source = "kojimock"
@ -45,11 +55,11 @@ pkgset_koji_module_tag = "dist-c8-module-compose"
pkgset_allow_reuse = False pkgset_allow_reuse = False
sigkeys = [ {% if sigkeys_fingerprints %}
{% for sigkey in sigkeys_fingerprints %} sigkeys = [{{ sigkeys_fingerprints | join(', ') }}]
"{{ sigkey }}",
{% endfor %} {% endif %}
]
filter_system_release_packages = False filter_system_release_packages = False
@ -57,7 +67,7 @@ filter_system_release_packages = False
gather_prepopulate = { gather_prepopulate = {
"scm": "git", "scm": "git",
"repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git", "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
"branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}{{ '-beta' if beta_suffix is defined and beta_suffix else '' }}", "branch": "{{ branch }}",
"file": "{{ arch }}/packages.json", "file": "{{ arch }}/packages.json",
} }
@ -86,12 +96,11 @@ createrepo_database = True
createrepo_c = True createrepo_c = True
createrepo_checksum = "sha256" createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_enable_cache = False
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 4 createrepo_num_workers = 4
createrepo_extra_args = [ createrepo_extra_args = [
'--distro=cpe:/o:{{ product_name.lower() }}:{{ product_name.lower() }}:{{ distribution_major_version }},{{ product_name }} {{ distribution_major_version }}', '--distro=cpe:/o:{{ product_name.lower() }}:{{ product_name.lower() }}:{{ distribution_major_version }},{{ product_name }} {{ distribution_major_version }}',
'--revision={{ distribution_major_version }}.{{ distribution_minor_version }}', '--revision={{ full_version }}',
] ]
# CHECKSUMS # CHECKSUMS
@ -108,14 +117,16 @@ lorax_options = [
"*": { "*": {
"noupgrade": False, "noupgrade": False,
"rootfs_size": 3, "rootfs_size": 3,
"version": "{{ distribution_major_version }}.{{ distribution_minor_version }}" "version": "{{ full_version }}"
} }
}) })
] ]
buildinstall_skip = [ buildinstall_skip = [
{% for variant, options in variants.items() %} {% for variant, options in variants.items() %}
{% if options['buildinstall_skip'] | default(false) %} {% if options['buildinstall_skip'] is not boolean %}
("^{{ variant }}$", {{ options['buildinstall_skip'] }}),
{% elif options['buildinstall_skip'] | default(false) %}
("^{{ variant }}$", { ("^{{ variant }}$", {
"*": True, "*": True,
}), }),
@ -129,11 +140,11 @@ image_name_format = {
"^{{ variant }}$": "{{ options['image_name_format'] }}", "^{{ variant }}$": "{{ options['image_name_format'] }}",
{% endif %} {% endif %}
{% endfor %} {% endfor %}
".*": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}", ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
} }
image_volid_formats = [ image_volid_formats = [
'{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}', '{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}',
] ]
# CREATEISO # CREATEISO