Auto-update building artifact "packages.json" for version "a9.3" and arch "x86_64" (2023-11-10 20:32:36.656620)

GPL is LICENSE in almalinux-release

aarch64/include_exclude.conf

@@ -33,6 +33,7 @@ filter_packages = [
                 "greenboot-rpm-ostree-grub2",
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
+                "subscription-manager-rhsm-certificates.aarch64",
             ]
         }
     ),
@@ -54,15 +55,17 @@ filter_packages = [
             ]
         }
     ),
+]
+filter_modules = [
     (
-        '^(extras)$', {
+        '^devel$', {
             '*': [
-                "centos-release-*",
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
             ]
         }
-    )
+    ),
 ]
-filter_modules = []
 
 # Based in distribution-comparison-tool report
 additional_packages = [
@@ -70,13 +73,50 @@ additional_packages = [
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
+                "lorax-templates-almalinux",
             ]
         }
     ),
     (
         '^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",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
             ]
         }
     ),

aarch64/modules_defaults/module_defaults/maven.yaml

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

aarch64/modules_defaults/module_defaults/nginx.yaml

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

aarch64/modules_defaults/module_defaults/nodejs.yaml

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

aarch64/modules_defaults/module_defaults/php.yaml

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

aarch64/modules_defaults/module_defaults/postgresql.yaml

@@ -0,0 +1,7 @@
+data:
+  module: postgresql
+  profiles:
+    '15':
+    - server
+document: modulemd-defaults
+version: '1'

aarch64/modules_defaults/module_defaults/redis.yaml

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

aarch64/modules_defaults/module_defaults/ruby.yaml

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

aarch64/modules_defaults/module_defaults/swig.yaml

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

aarch64/variants.xml

@@ -118,7 +118,19 @@
       <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>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>php:8.1</module>
+      <module>postgresql:15</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
@@ -127,6 +139,9 @@
     <groups>
       <group default="false">crb</group>
     </groups>
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -211,4 +226,30 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
+    <groups>
+      <group default="false">gnome-apps</group>
+      <group default="false">office-suite</group>
+      <group default="false">platform-vmware</group>
+    </groups>
+    <environments>
+      <environment display_order="99">virtualization-host-environment</environment>
+      <environment display_order="4">workstation-product-environment</environment>
+    </environments>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>javapackages-tools:202201</module>
+      <module>maven-devel:3.8</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>swig-devel:4.1</module>
+    </modules>
+  </variant>
 </variants>

aarch64/variants_options.json

@@ -2,14 +2,24 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -78,13 +88,39 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
+    },
+    "devel": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "CRB",
+            "SAP",
+            "SAPHANA",
+            "extras",
+            "Minimal",
+            "ResilientStorage",
+            "HighAvailability"
+        ]
     }
 }

i686/extra_options.conf

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

i686/include_exclude.conf

@@ -0,0 +1,149 @@
+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",
+                "subscription-manager-rhsm-certificates.i686",
+            ]
+        }
+    ),
+    (
+        '^(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",
+            ]
+        }
+    ),
+]
+filter_modules = [
+    (
+        '^AppStream$', {
+            '*': [
+                "maven:3.8",
+            ]
+        }
+    ),
+    (
+        '^devel$', {
+            '*': [
+                "javapackages-tools:202201",
+            ]
+        }
+    ),
+]
+
+additional_packages = [
+    (
+        '^AppStream$', {
+            '*': [
+                "almalinux-backgrounds",
+                "lorax-templates-almalinux",
+            ]
+        }
+    ),
+    (
+        '^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",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
+            ]
+        }
+    ),
+    (
+        '^extras$', {
+            '*': [
+                "anaconda-live",
+            ]
+        }
+    )
+]

i686/modules_defaults/module_defaults/maven.yaml

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

i686/modules_defaults/module_defaults/nginx.yaml

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

i686/modules_defaults/module_defaults/nodejs.yaml

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

i686/modules_defaults/module_defaults/php.yaml

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

i686/modules_defaults/module_defaults/postgresql.yaml

@@ -0,0 +1,7 @@
+data:
+  module: postgresql
+  profiles:
+    '15':
+    - server
+document: modulemd-defaults
+version: '1'

i686/modules_defaults/module_defaults/redis.yaml

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

i686/modules_defaults/module_defaults/ruby.yaml

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

i686/modules_defaults/module_defaults/swig.yaml

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

i686/multilib.conf

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

i686/variants.xml

@@ -0,0 +1,268 @@
+<?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>i686</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>i686</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>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>php:8.1</module>
+      <module>postgresql:15</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
+  </variant>
+  <variant id="CRB" name="CRB" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">crb</group>
+    </groups>
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
+  </variant>
+  <variant id="HighAvailability" name="HighAvailability" type="variant">
+    <arches>
+      <arch>i686</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>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
+    </groups>
+  </variant>
+  <variant id="SAP" name="SAP" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="RT" name="RT" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="false">rt</group>
+      <group default="false">rt-debug</group>
+    </groups>
+  </variant>
+  <variant id="NFV" name="NFV" type="variant">
+    <arches>
+      <arch>i686</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="extras" name="extras" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+  </variant>
+  <variant id="Minimal" name="Minimal" type="variant">
+    <arches>
+      <arch>i686</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>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>ruby-devel:3.1</module>
+      <module>swig-devel:4.1</module>
+    </modules>
+  </variant>
+</variants>

i686/variants_options.json

@@ -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"
+        ]
+    }
+}

ppc64le/include_exclude.conf

@@ -33,6 +33,7 @@ filter_packages = [
                 "greenboot-rpm-ostree-grub2",
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
+                "subscription-manager-rhsm-certificates.ppc64le",
             ]
         }
     ),
@@ -54,28 +55,75 @@ filter_packages = [
             ]
         }
     ),
+]
+filter_modules = [
     (
-        '^(extras)$', {
+        '^devel$', {
             '*': [
-                "centos-release-*",
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
             ]
         }
-    )
+    ),
 ]
-filter_modules = []
 
 additional_packages = [
     (
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
+                "keylime-selinux",
+                "lorax-templates-almalinux",
+            ]
+        }
+    ),
+    (
+        '^CRB$', {
+            '*': [
+                "xorg-x11-server-source",
             ]
         }
     ),
     (
         '^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",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
             ]
         }
     ),

ppc64le/modules_defaults/module_defaults/maven.yaml

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

ppc64le/modules_defaults/module_defaults/nginx.yaml

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

ppc64le/modules_defaults/module_defaults/nodejs.yaml

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

ppc64le/modules_defaults/module_defaults/php.yaml

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

ppc64le/modules_defaults/module_defaults/postgresql.yaml

@@ -0,0 +1,7 @@
+data:
+  module: postgresql
+  profiles:
+    '15':
+    - server
+document: modulemd-defaults
+version: '1'

ppc64le/modules_defaults/module_defaults/redis.yaml

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

ppc64le/modules_defaults/module_defaults/ruby.yaml

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

ppc64le/modules_defaults/module_defaults/swig.yaml

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

ppc64le/variants.xml

@@ -115,8 +115,19 @@
       <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>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>php:8.1</module>
+      <module>postgresql:15</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
@@ -125,6 +136,9 @@
     <groups>
       <group default="false">crb</group>
     </groups>
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -140,9 +154,9 @@
       <arch>ppc64le</arch>
     </arches>
     <groups>
-      <group default="true">ha</group>
-      <group default="true">ha-devel</group>
-      <group default="true">resilient-storage</group>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
     </groups>
   </variant>
   <variant id="SAP" name="SAP" type="variant">
@@ -209,4 +223,32 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>ppc64le</arch>
+    </arches>
+    <groups>
+      <group default="false">dotnet</group>
+      <group default="false">office-suite</group>
+      <group default="false">platform-microsoft</group>
+      <group default="false">platform-vmware</group>
+      <group default="false">virtualization-client</group>
+      <group default="false">virtualization-tools</group>
+    </groups>
+    <environments>
+      <environment display_order="99">virtualization-host-environment</environment>
+    </environments>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>javapackages-tools:202201</module>
+      <module>maven-devel:3.8</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>swig-devel:4.1</module>
+    </modules>
+  </variant>
 </variants>

ppc64le/variants_options.json

@@ -2,14 +2,24 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -78,13 +88,39 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
+    },
+    "devel": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "CRB",
+            "SAP",
+            "SAPHANA",
+            "extras",
+            "Minimal",
+            "ResilientStorage",
+            "HighAvailability"
+        ]
     }
 }

pungi-build.conf.j2

@@ -1,36 +1,51 @@
+{% 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 "a" + full_version %}
+
 from include_exclude import *
 from multilib import *
+{% if extra_options %}
+from extra_options import *
+{% endif %}
 
 # PRODUCT INFO
 release_name = "{{ product_name }}"
 release_short = "{{ product_name }}"
-release_version = "{{ distribution_major_version }}.{{ distribution_minor_version }}"
+release_version = "{{ full_version }}"
 treeinfo_version = "{{ distribution_major_version }}"
 
 # GENERAL SETTINGS
 comps_file = {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}",
+    "branch": "{{ branch }}",
     "file": "{{ arch }}/comps.xml",
 }
 
 link_type = 'hardlink'
 
-module_defaults_dir =  'koji/module_defaults'
+module_defaults_dir =  {
+    "scm": "git",
+    "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
+    "branch": "{{ branch }}",
+    "dir": "{{ arch }}/modules_defaults/module_defaults",
+}
 
 variants_file = {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}",
+    "branch": "{{ branch }}",
     "file": "{{ arch }}/variants.xml",
 }
 hashed_directories = False
 
+{% if arch == 'x86_64' %}
+tree_arches = ['{{ arch }}', 'i686']
+{% else %}
 tree_arches = ['{{ arch }}']
+{% endif %}
 
 # PKGSET
-pkgset_source = "koji"
+pkgset_source = "kojimock"
 koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}"
 
 # PKGSET - KOJI
@@ -39,13 +54,20 @@ pkgset_koji_inherit = False
 pkgset_koji_module_tag = "dist-c8-module-compose"
 pkgset_allow_reuse = False
 
+
+{% if sigkeys_fingerprints %}
+sigkeys = [{{ sigkeys_fingerprints | join(', ') }}]
+
+{% endif %}
+
+
 filter_system_release_packages = False
 
 # GATHER
 gather_prepopulate = {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
-    "branch": "a{{ distribution_major_version }}.{{ distribution_minor_version }}",
+    "branch": "{{ branch }}",
     "file": "{{ arch }}/packages.json",
 }
 
@@ -78,7 +100,7 @@ createrepo_num_threads = 8
 createrepo_num_workers = 4
 createrepo_extra_args = [
     '--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
@@ -95,14 +117,16 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "{{ distribution_major_version }}.{{ distribution_minor_version }}"
+            "version": "{{ full_version }}"
         }
     })
 ]
 
 buildinstall_skip = [
     {% 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 }}$", {
         "*": True,
     }),
@@ -116,11 +140,11 @@ image_name_format = {
     "^{{ variant }}$": "{{ options['image_name_format'] }}",
         {% endif %}
     {% endfor %}
-    ".*": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
 }
 
 image_volid_formats = [
-    '{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}',
+    '{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}',
 ]
 
 # CREATEISO
@@ -159,4 +183,22 @@ variant_as_lookaside = [
     {% endfor %}
 ]
 
+extra_files = [
+    ('^.*$', {
+        '*': [
+            {
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                    'LICENSE',
+                    'EULA',
+                    'RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}',
+                ],
+                "target": "",
+            }
+        ],
+    }),
+]
+
 productimg = False

s390x/include_exclude.conf

@@ -34,6 +34,7 @@ filter_packages = [
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
                 "pcp-pmda-bpf",
+                "subscription-manager-rhsm-certificates.s390x",
             ]
         }
     ),
@@ -63,20 +64,83 @@ filter_packages = [
         }
     )
 ]
-filter_modules = []
+filter_modules = [
+    (
+        '^devel$', {
+            '*': [
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
+            ]
+        }
+    ),
+]
 
 additional_packages = [
     (
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
+                "aspnetcore-runtime-7.0",
+                "aspnetcore-targeting-pack-7.0",
+                "dotnet-apphost-pack-7.0",
+                "dotnet-hostfxr-7.0",
+                "dotnet-runtime-7.0",
+                "dotnet-sdk-7.0",
+                "dotnet-targeting-pack-7.0",
+                "dotnet-templates-7.0",
+                "keylime-selinux",
+                "lorax-templates-almalinux",
+            ]
+        }
+    ),
+    (
+        '^CRB$', {
+            '*': [
+                "dotnet-sdk-7.0-source-built-artifacts",
+                "xorg-x11-server-source",
             ]
         }
     ),
     (
         '^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",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
             ]
         }
     ),

s390x/modules_defaults/module_defaults/maven.yaml

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

s390x/modules_defaults/module_defaults/nginx.yaml

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

s390x/modules_defaults/module_defaults/nodejs.yaml

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

s390x/modules_defaults/module_defaults/php.yaml

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

s390x/modules_defaults/module_defaults/postgresql.yaml

@@ -0,0 +1,7 @@
+data:
+  module: postgresql
+  profiles:
+    '15':
+    - server
+document: modulemd-defaults
+version: '1'

s390x/modules_defaults/module_defaults/redis.yaml

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

s390x/modules_defaults/module_defaults/ruby.yaml

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

s390x/modules_defaults/module_defaults/swig.yaml

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

s390x/variants.xml

@@ -112,7 +112,19 @@
       <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>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>php:8.1</module>
+      <module>postgresql:15</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
@@ -121,6 +133,9 @@
     <groups>
       <group default="false">crb</group>
     </groups>
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -136,9 +151,9 @@
       <arch>s390x</arch>
     </arches>
     <groups>
-      <group default="true">ha</group>
-      <group default="true">ha-devel</group>
-      <group default="true">resilient-storage</group>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
     </groups>
   </variant>
   <variant id="SAP" name="SAP" type="variant">
@@ -204,4 +219,35 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>s390x</arch>
+    </arches>
+    <groups>
+      <group default="false">gnome-apps</group>
+      <group default="false">graphics</group>
+      <group default="false">guest-agents</group>
+      <group default="false">infiniband</group>
+      <group default="false">multimedia</group>
+      <group default="false">office-suite</group>
+      <group default="false">platform-microsoft</group>
+      <group default="false">platform-vmware</group>
+    </groups>
+    <environments>
+      <environment display_order="99">virtualization-host-environment</environment>
+      <environment display_order="4">workstation-product-environment</environment>
+    </environments>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>javapackages-tools:202201</module>
+      <module>maven-devel:3.8</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>swig-devel:4.1</module>
+    </modules>
+  </variant>
 </variants>

s390x/variants_options.json

@@ -2,14 +2,24 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -78,13 +88,39 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
+    },
+    "devel": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "CRB",
+            "SAP",
+            "SAPHANA",
+            "extras",
+            "Minimal",
+            "ResilientStorage",
+            "HighAvailability"
+        ]
     }
 }

x86_64/include_exclude.conf

@@ -44,6 +44,7 @@ filter_packages = [
                 "greenboot-rpm-ostree-grub2",
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
+                "subscription-manager-rhsm-certificates.x86_64",
             ]
         }
     ),
@@ -68,28 +69,68 @@ filter_packages = [
             ]
         }
     ),
+]
+filter_modules = [
     (
-        '^(extras)$', {
+        '^devel$', {
             '*': [
-                "centos-release-*",
+                "javapackages-bootstrap-devel:202201",
+                "javapackages-bootstrap:202201",
             ]
         }
-    )
+    ),
 ]
-filter_modules = []
 
 additional_packages = [
     (
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
+                "lorax-templates-almalinux",
             ]
         }
     ),
     (
         '^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",
+                "glibc-gconv-extra.i686",
+                "libsss_autofs",
+                "sssd-nfs-idmap",
+                "glibc-gconv-extra",
+                "kbd-legacy",
             ]
         }
     ),

x86_64/modules_defaults/module_defaults/maven.yaml

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

x86_64/modules_defaults/module_defaults/nginx.yaml

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

x86_64/modules_defaults/module_defaults/nodejs.yaml

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

x86_64/modules_defaults/module_defaults/php.yaml

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

x86_64/modules_defaults/module_defaults/postgresql.yaml

@@ -0,0 +1,7 @@
+data:
+  module: postgresql
+  profiles:
+    '15':
+    - server
+document: modulemd-defaults
+version: '1'

x86_64/modules_defaults/module_defaults/redis.yaml

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

x86_64/modules_defaults/module_defaults/ruby.yaml

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

x86_64/modules_defaults/module_defaults/swig.yaml

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

x86_64/variants.xml

@@ -124,6 +124,16 @@
       <environment display_order="99">virtualization-host-environment</environment>
       <environment display_order="4">workstation-product-environment</environment>
     </environments>
+    <modules>
+      <module>maven:3.8</module>
+      <module>nginx:1.22</module>
+      <module>nodejs:18</module>
+      <module>nodejs:20</module>
+      <module>php:8.1</module>
+      <module>postgresql:15</module>
+      <module>redis:7</module>
+      <module>ruby:3.1</module>
+    </modules>
   </variant>
   <variant id="CRB" name="CRB" type="variant">
     <arches>
@@ -132,6 +142,9 @@
     <groups>
       <group default="false">crb</group>
     </groups>
+    <modules>
+      <module>swig:4.1</module>
+    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -147,29 +160,9 @@
       <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>
+      <group default="false">ha</group>
+      <group default="false">ha-devel</group>
+      <group default="false">resilient-storage</group>
     </groups>
   </variant>
   <variant id="SAP" name="SAP" type="variant">
@@ -236,4 +229,41 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </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="devel" name="devel" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+    <modules>
+      <module>javapackages-tools-devel:202201</module>
+      <module>javapackages-tools:202201</module>
+      <module>maven-devel:3.8</module>
+      <module>nginx-devel:1.22</module>
+      <module>nodejs-devel:18</module>
+      <module>nodejs-devel:20</module>
+      <module>php-devel:8.1</module>
+      <module>postgresql-devel:15</module>
+      <module>redis-devel:7</module>
+      <module>swig-devel:4.1</module>
+    </modules>
+  </variant>
 </variants>

x86_64/variants_options.json

@@ -2,14 +2,24 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
     },
     "AppStream": {
@@ -96,13 +106,41 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}",
-            "skip_src": true
+            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "branch": "a{{ distribution_major_version }}",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
         }]
+    },
+    "devel": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "CRB",
+            "SAP",
+            "SAPHANA",
+            "extras",
+            "Minimal",
+            "RT",
+            "NFV",
+            "ResilientStorage",
+            "HighAvailability"
+        ]
     }
 }