Auto-update building artifact "comps.xml" for version "a10.0-kitten" and arch "x86_64_v2" (2024-12-26 12:10:37.419853)

Reviewed-on: #7

aarch64/include_exclude.conf

@@ -3,6 +3,7 @@ filter_packages = [
         '^(BaseOS|Minimal|AppStream|CRB)$', {
             'aarch64': [
                 "insights-client",
+                "insights-client-ros",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
                 "libreport-rhel-anaconda-bugzilla",
@@ -27,7 +28,6 @@ filter_packages = [
                 "rhsm-icons",
                 "rhc",
                 "rhc-worker-playbook",
-                "python2-gluster*",
                 "greenboot-grub2",
                 "greenboot-reboot",
                 "greenboot-rpm-ostree-grub2",
@@ -37,15 +37,6 @@ filter_packages = [
             ]
         }
     ),
-    (
-        '^(BaseOS|Minimal)$', {
-            'aarch64': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
-            ]
-        }
-    ),
     (
         '^(AppStream)$', {
             'aarch64': [
@@ -74,6 +65,22 @@ additional_packages = [
             '*': [
                 "almalinux-backgrounds",
                 "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
+                "spice-gtk",
+                "spice-gtk-tools",
+                "spice-gtk3-vala",
+                "spice-html5",
+                "spice-webdavd",
+            ]
+        }
+    ),
+    (
+        '^CRB$', {
+            '*': [
+                "spice-glib-devel",
+                "spice-gtk3-devel",
+                "spice-server-devel",
             ]
         }
     ),
@@ -113,17 +120,23 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
+                "kdump-utils",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
+                "smartmontools-selinux",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^extras-common$', {
             '*': [
                 "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
             ]
         }
     )

aarch64/modules_defaults/module_defaults/maven.yaml

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

aarch64/modules_defaults/module_defaults/nginx.yaml

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

aarch64/modules_defaults/module_defaults/nodejs.yaml

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

aarch64/modules_defaults/module_defaults/php.yaml

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

aarch64/modules_defaults/module_defaults/postgresql.yaml

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

aarch64/modules_defaults/module_defaults/redis.yaml

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

aarch64/modules_defaults/module_defaults/ruby.yaml

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

aarch64/modules_defaults/module_defaults/swig.yaml

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

aarch64/variants.xml

@@ -54,9 +54,7 @@
     <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>
@@ -79,11 +77,8 @@
       <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>
@@ -101,7 +96,6 @@
       <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>
@@ -118,19 +112,7 @@
       <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>
@@ -139,9 +121,6 @@
     <groups>
       <group default="false">crb</group>
     </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -152,37 +131,6 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
-    <arches>
-      <arch>aarch64</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>aarch64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>aarch64</arch>
-    </arches>
-  </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
       <arch>aarch64</arch>
@@ -226,30 +174,30 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
-  <variant id="devel" name="devel" type="variant">
+  <variant id="SAP" name="SAP" type="variant">
     <arches>
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">gnome-apps</group>
+      <group default="false">sap</group>
-      <group default="false">office-suite</group>
-      <group default="false">platform-vmware</group>
     </groups>
-    <environments>
+  </variant>
-      <environment display_order="99">virtualization-host-environment</environment>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
-      <environment display_order="4">workstation-product-environment</environment>
+    <arches>
-    </environments>
+      <arch>aarch64</arch>
-    <modules>
+    </arches>
-      <module>javapackages-tools-devel:202201</module>
+    <groups>
-      <module>javapackages-tools:202201</module>
+      <group default="false">sap-hana</group>
-      <module>maven-devel:3.8</module>
+    </groups>
-      <module>nginx-devel:1.22</module>
+  </variant>
-      <module>nodejs-devel:18</module>
+  <variant id="extras-common" name="extras-common" type="variant">
-      <module>nodejs-devel:20</module>
+    <arches>
-      <module>php-devel:8.1</module>
+      <arch>aarch64</arch>
-      <module>postgresql-devel:15</module>
+    </arches>
-      <module>redis-devel:7</module>
+  </variant>
-      <module>swig-devel:4.1</module>
+  <variant id="devel" name="devel" type="variant">
-    </modules>
+    <arches>
+      <arch>aarch64</arch>
+    </arches>
   </variant>
 </variants>

aarch64/variants_options.json

@@ -2,18 +2,18 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -48,24 +48,6 @@
             "AppStream"
         ]
     },
-    "ResilientStorage": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
-    "extras": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
     "SAPHANA": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -88,17 +70,17 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -107,6 +89,15 @@
             }]
         }]
     },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
     "devel": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -117,9 +108,7 @@
             "CRB",
             "SAP",
             "SAPHANA",
-            "extras",
             "Minimal",
-            "ResilientStorage",
             "HighAvailability"
         ]
     }

i686/extra_options.conf

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

i686/modules_defaults/module_defaults/maven.yaml

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

i686/modules_defaults/module_defaults/nginx.yaml

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

i686/modules_defaults/module_defaults/nodejs.yaml

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

i686/modules_defaults/module_defaults/php.yaml

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

i686/modules_defaults/module_defaults/postgresql.yaml

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

i686/modules_defaults/module_defaults/redis.yaml

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

i686/modules_defaults/module_defaults/ruby.yaml

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

i686/modules_defaults/module_defaults/swig.yaml

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

ppc64le/include_exclude.conf

@@ -3,6 +3,7 @@ filter_packages = [
         '^(BaseOS|Minimal|AppStream|CRB)$', {
             'ppc64le': [
                 "insights-client",
+                "insights-client-ros",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
                 "libreport-rhel-anaconda-bugzilla",
@@ -27,7 +28,6 @@ filter_packages = [
                 "rhsm-icons",
                 "rhc",
                 "rhc-worker-playbook",
-                "python2-gluster*",
                 "greenboot-grub2",
                 "greenboot-reboot",
                 "greenboot-rpm-ostree-grub2",
@@ -37,15 +37,6 @@ filter_packages = [
             ]
         }
     ),
-    (
-        '^(BaseOS|Minimal)$', {
-            'ppc64le': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
-            ]
-        }
-    ),
     (
         '^(AppStream)$', {
             'ppc64le': [
@@ -56,24 +47,86 @@ filter_packages = [
         }
     ),
 ]
-filter_modules = [
+filter_modules = []
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-bootstrap-devel:202201",
-                "javapackages-bootstrap:202201",
-            ]
-        }
-    ),
-]
 
 additional_packages = [
     (
         '^AppStream$', {
             '*': [
                 "almalinux-backgrounds",
-                "keylime-selinux",
                 "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
+                "qemu-kvm-audio-pa",
+                "qemu-kvm-device-display-virtio-gpu",
+                "qemu-kvm-device-display-virtio-vga",
+                "qemu-kvm-tools",
+                "qemu-pr-helper",
+                "qemu-kvm-common",
+                "qemu-kvm",
+                "qemu-kvm-core",
+                "qemu-kvm-docs",
+                "qemu-kvm-block-blkio",
+                "qemu-kvm-block-rbd",
+                "qemu-guest-agent",
+                "qemu-kvm-device-usb-host",
+                "qemu-img",
+                "qemu-kvm-block-curl",
+                "qemu-kvm-device-display-virtio-gpu-pci",
+                "libguestfs-rescue",
+                "perl-Sys-Guestfs",
+                "libguestfs-inspect-icons",
+                "libguestfs-bash-completion",
+                "libguestfs-xfs",
+                "python3-libguestfs",
+                "libguestfs-rsync",
+                "libguestfs-appliance",
+                "libguestfs",
+                "virt-win-reg",
+                "guestfs-tools",
+                "supermin",
+                "seabios-bin",
+                "seavgabios-bin",
+                "libvirt-daemon-common",
+                "libvirt-libs",
+                "libvirt-daemon-driver-interface",
+                "libvirt-daemon-driver-qemu",
+                "libvirt-daemon-driver-storage-core",
+                "libvirt-daemon-driver-nwfilter",
+                "libvirt-daemon-driver-nodedev",
+                "libvirt-daemon-driver-secret",
+                "libvirt-daemon-driver-network",
+                "libvirt-daemon-proxy",
+                "libvirt-daemon-log",
+                "libvirt-client",
+                "libvirt-daemon",
+                "libvirt-daemon-lock",
+                "libvirt-nss",
+                "libvirt-ssh-proxy",
+                "libvirt-daemon-driver-storage-rbd",
+                "libvirt-daemon-driver-storage-logical",
+                "libvirt-daemon-driver-storage-disk",
+                "libvirt-daemon-driver-storage-scsi",
+                "libvirt-daemon-driver-storage-iscsi",
+                "libvirt-daemon-plugin-lockd",
+                "libvirt-daemon-driver-storage-mpath",
+                "libvirt-client-qemu",
+                "libvirt-daemon-config-nwfilter",
+                "libvirt-daemon-config-network",
+                "libvirt",
+                "libvirt-daemon-driver-storage",
+                "libvirt-daemon-kvm",
+                "virt-top",
+                "swtpm-selinux",
+                "libvirt-glib",
+                "virt-install",
+                "virt-manager",
+                "virt-manager-common",
+                "spice-gtk",
+                "spice-gtk-tools",
+                "spice-gtk3-vala",
+                "spice-html5",
+                "spice-webdavd",
             ]
         }
     ),
@@ -81,6 +134,18 @@ additional_packages = [
         '^CRB$', {
             '*': [
                 "xorg-x11-server-source",
+                "ocaml-libguestfs-devel",
+                "libguestfs-devel",
+                "libguestfs-man-pages-ja",
+                "ocaml-libguestfs",
+                "libguestfs-man-pages-uk",
+                "supermin-devel",
+                "libvirt-docs",
+                "libvirt-devel",
+                "libvirt-daemon-plugin-sanlock",
+                "spice-glib-devel",
+                "spice-gtk3-devel",
+                "spice-server-devel",
             ]
         }
     ),
@@ -120,17 +185,23 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
+                "kdump-utils",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
+                "smartmontools-selinux",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^extras-common$', {
             '*': [
                 "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
             ]
         }
     )

ppc64le/modules_defaults/module_defaults/maven.yaml

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

ppc64le/modules_defaults/module_defaults/nginx.yaml

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

ppc64le/modules_defaults/module_defaults/nodejs.yaml

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

ppc64le/modules_defaults/module_defaults/php.yaml

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

ppc64le/modules_defaults/module_defaults/postgresql.yaml

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

ppc64le/modules_defaults/module_defaults/redis.yaml

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

ppc64le/modules_defaults/module_defaults/ruby.yaml

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

ppc64le/modules_defaults/module_defaults/swig.yaml

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

ppc64le/variants.xml

@@ -56,7 +56,6 @@
       <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>
@@ -65,11 +64,11 @@
       <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>
@@ -79,11 +78,8 @@
       <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>
@@ -100,7 +96,6 @@
       <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>
@@ -115,19 +110,8 @@
       <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>
@@ -136,9 +120,6 @@
     <groups>
       <group default="false">crb</group>
     </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -149,37 +130,6 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
-    <arches>
-      <arch>ppc64le</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>ppc64le</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>ppc64le</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>ppc64le</arch>
-    </arches>
-  </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
       <arch>ppc64le</arch>
@@ -223,32 +173,30 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
-  <variant id="devel" name="devel" type="variant">
+  <variant id="SAP" name="SAP" type="variant">
     <arches>
       <arch>ppc64le</arch>
     </arches>
     <groups>
-      <group default="false">dotnet</group>
+      <group default="false">sap</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>
+  </variant>
-      <environment display_order="99">virtualization-host-environment</environment>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    </environments>
+    <arches>
-    <modules>
+      <arch>ppc64le</arch>
-      <module>javapackages-tools-devel:202201</module>
+    </arches>
-      <module>javapackages-tools:202201</module>
+    <groups>
-      <module>maven-devel:3.8</module>
+      <group default="false">sap-hana</group>
-      <module>nginx-devel:1.22</module>
+    </groups>
-      <module>nodejs-devel:18</module>
+  </variant>
-      <module>nodejs-devel:20</module>
+  <variant id="extras-common" name="extras-common" type="variant">
-      <module>php-devel:8.1</module>
+    <arches>
-      <module>postgresql-devel:15</module>
+      <arch>ppc64le</arch>
-      <module>redis-devel:7</module>
+    </arches>
-      <module>swig-devel:4.1</module>
+  </variant>
-    </modules>
+  <variant id="devel" name="devel" type="variant">
+    <arches>
+      <arch>ppc64le</arch>
+    </arches>
   </variant>
 </variants>

ppc64le/variants_options.json

@@ -2,18 +2,18 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -48,24 +48,6 @@
             "AppStream"
         ]
     },
-    "ResilientStorage": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
-    "extras": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
     "SAPHANA": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -88,17 +70,17 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -107,6 +89,15 @@
             }]
         }]
     },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
     "devel": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -117,9 +108,7 @@
             "CRB",
             "SAP",
             "SAPHANA",
-            "extras",
             "Minimal",
-            "ResilientStorage",
             "HighAvailability"
         ]
     }

pungi-build.conf.j2

@@ -8,9 +8,10 @@ from extra_options import *
 {% endif %}
 
 # PRODUCT INFO
-release_name = "{{ product_name }}"
+{% set full_product_name = product_name %}
-release_short = "{{ product_name }}"
+release_name = "{{ full_product_name | replace('-', ' ') }}"
-release_version = "{{ full_version }}"
+release_short = "{{ full_product_name }}"
+release_version = "{{ distribution_major_version }}"
 treeinfo_version = "{{ distribution_major_version }}"
 
 # GENERAL SETTINGS
@@ -23,6 +24,8 @@ comps_file = {
 
 link_type = 'hardlink'
 
+createiso_use_xorrisofs = True
+
 module_defaults_dir =  {
     "scm": "git",
     "repo": "https://git.almalinux.org/almalinux/pungi-almalinux.git",
@@ -46,7 +49,7 @@ tree_arches = ['{{ arch }}']
 
 # PKGSET
 pkgset_source = "kojimock"
-koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}"
+koji_profile = "{{ product_name.lower() }}_{{ distribution_major_version }}_{{ arch }}"
 
 # PKGSET - KOJI
 pkgset_koji_tag = "dist-c8-compose"
@@ -117,7 +120,7 @@ lorax_options = [
         "*": {
             "noupgrade": False,
             "rootfs_size": 3,
-            "version": "{{ full_version }}"
+            "version": "{{ distribution_major_version }}"
         }
     })
 ]
@@ -140,11 +143,11 @@ image_name_format = {
     "^{{ variant }}$": "{{ options['image_name_format'] }}",
         {% endif %}
     {% endfor %}
-    ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+    ".*": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
 }
 
 image_volid_formats = [
-    '{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}',
+    '{release_short}-{{ distribution_major_version }}-{arch}',
 ]
 
 # CREATEISO
@@ -161,6 +164,11 @@ createiso_skip = [
     {% endfor %}
 ]
 
+createrepo_extra_args = [
+    "--compress-type=gz",
+    "--general-compress-type=gz",
+]
+
 extra_isos = {
     {% for variant, options in variants.items() %}
         {% if options['extra_isos'] | default(false) %}
@@ -188,8 +196,8 @@ extra_files = [
         '*': [
             {
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                     'LICENSE',
                     'EULA',

s390x/include_exclude.conf

@@ -3,6 +3,7 @@ filter_packages = [
         '^(BaseOS|Minimal|AppStream|CRB)$', {
             's390x': [
                 "insights-client",
+                "insights-client-ros",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
                 "libreport-rhel-anaconda-bugzilla",
@@ -27,26 +28,15 @@ filter_packages = [
                 "rhsm-icons",
                 "rhc",
                 "rhc-worker-playbook",
-                "python2-gluster*",
                 "greenboot-grub2",
                 "greenboot-reboot",
                 "greenboot-rpm-ostree-grub2",
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
-                "pcp-pmda-bpf",
                 "subscription-manager-rhsm-certificates.s390x",
             ]
         }
     ),
-    (
-        '^(BaseOS|Minimal)$', {
-            's390x': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
-            ]
-        }
-    ),
     (
         '^(AppStream)$', {
             's390x': [
@@ -60,36 +50,28 @@ filter_packages = [
         '^(extras)$', {
             '*': [
                 "centos-release-*",
+                "centos-release-cloud.noarch",
+                "centos-release-ovirt45-testing.noarch",
+                "centos-release-openstack-yoga.noarch",
             ]
         }
     )
 ]
-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",
+                "firefox",
+                "thunderbird",
+                "spice-gtk",
+                "spice-gtk-tools",
+                "spice-gtk3-vala",
+                "spice-html5",
+                "spice-webdavd",
             ]
         }
     ),
@@ -98,6 +80,9 @@ additional_packages = [
             '*': [
                 "dotnet-sdk-7.0-source-built-artifacts",
                 "xorg-x11-server-source",
+                "spice-glib-devel",
+                "spice-gtk3-devel",
+                "spice-server-devel",
             ]
         }
     ),
@@ -137,17 +122,23 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
+                "kdump-utils",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
+                "smartmontools-selinux",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^extras-common$', {
             '*': [
                 "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
             ]
         }
     )

s390x/modules_defaults/module_defaults/maven.yaml

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

s390x/modules_defaults/module_defaults/nginx.yaml

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

s390x/modules_defaults/module_defaults/nodejs.yaml

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

s390x/modules_defaults/module_defaults/php.yaml

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

s390x/modules_defaults/module_defaults/postgresql.yaml

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

s390x/modules_defaults/module_defaults/redis.yaml

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

s390x/modules_defaults/module_defaults/ruby.yaml

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

s390x/modules_defaults/module_defaults/swig.yaml

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

s390x/variants.xml

@@ -55,7 +55,6 @@
       <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>
@@ -75,11 +74,8 @@
       <group default="false">hardware-monitoring</group>
       <group default="false">headless-management</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">network-file-system-client</group>
       <group default="false">network-server</group>
@@ -95,7 +91,6 @@
       <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>
@@ -112,19 +107,7 @@
       <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>
@@ -133,9 +116,6 @@
     <groups>
       <group default="false">crb</group>
     </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -146,37 +126,6 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
-    <arches>
-      <arch>s390x</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>s390x</arch>
-    </arches>
-    <groups>
-      <group default="false">sap</group>
-    </groups>
-  </variant>
-  <variant id="SAPHANA" name="SAPHANA" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-    <groups>
-      <group default="false">sap-hana</group>
-    </groups>
-  </variant>
-  <variant id="extras" name="extras" type="variant">
-    <arches>
-      <arch>s390x</arch>
-    </arches>
-  </variant>
   <variant id="Minimal" name="Minimal" type="variant">
     <arches>
       <arch>s390x</arch>
@@ -219,35 +168,30 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
-  <variant id="devel" name="devel" type="variant">
+  <variant id="SAP" name="SAP" type="variant">
     <arches>
       <arch>s390x</arch>
     </arches>
     <groups>
-      <group default="false">gnome-apps</group>
+      <group default="false">sap</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>
+  </variant>
-      <environment display_order="99">virtualization-host-environment</environment>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
-      <environment display_order="4">workstation-product-environment</environment>
+    <arches>
-    </environments>
+      <arch>s390x</arch>
-    <modules>
+    </arches>
-      <module>javapackages-tools-devel:202201</module>
+    <groups>
-      <module>javapackages-tools:202201</module>
+      <group default="false">sap-hana</group>
-      <module>maven-devel:3.8</module>
+    </groups>
-      <module>nginx-devel:1.22</module>
+  </variant>
-      <module>nodejs-devel:18</module>
+  <variant id="extras-common" name="extras-common" type="variant">
-      <module>nodejs-devel:20</module>
+    <arches>
-      <module>php-devel:8.1</module>
+      <arch>s390x</arch>
-      <module>postgresql-devel:15</module>
+    </arches>
-      <module>redis-devel:7</module>
+  </variant>
-      <module>swig-devel:4.1</module>
+  <variant id="devel" name="devel" type="variant">
-    </modules>
+    <arches>
+      <arch>s390x</arch>
+    </arches>
   </variant>
 </variants>

s390x/variants_options.json

@@ -2,18 +2,18 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -48,24 +48,6 @@
             "AppStream"
         ]
     },
-    "ResilientStorage": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
-    "extras": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
     "SAPHANA": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -88,17 +70,17 @@
     },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -107,6 +89,15 @@
             }]
         }]
     },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
     "devel": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -117,10 +108,9 @@
             "CRB",
             "SAP",
             "SAPHANA",
-            "extras",
             "Minimal",
-            "ResilientStorage",
             "HighAvailability"
         ]
     }
 }
+

x86_64/include_exclude.conf

@@ -3,6 +3,7 @@ filter_packages = [
         '^(BaseOS|Minimal|AppStream|CRB)$', {
             'x86_64': [
                 "insights-client",
+                "insights-client-ros",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
                 "libreport-rhel-anaconda-bugzilla",
@@ -17,8 +18,6 @@ filter_packages = [
                 "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",
@@ -27,35 +26,21 @@ filter_packages = [
                 "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.x86_64",
+                "kernel-rt-core.x86_64",
+                "kernel-rt-modules-core.x86_64",
             ]
         }
     ),
     (
         '^(BaseOS|Minimal)$', {
             'x86_64': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
                 "python-unversioned-command",
-                "python.i686",
             ]
         }
     ),
@@ -64,22 +49,12 @@ filter_packages = [
             'x86_64': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
-                "libvirt-glib.i686",
                 "sos",
             ]
         }
     ),
 ]
-filter_modules = [
+filter_modules = []
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-bootstrap-devel:202201",
-                "javapackages-bootstrap:202201",
-            ]
-        }
-    ),
-]
 
 additional_packages = [
     (
@@ -87,6 +62,22 @@ additional_packages = [
             '*': [
                 "almalinux-backgrounds",
                 "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
+                "spice-gtk",
+                "spice-gtk-tools",
+                "spice-gtk3-vala",
+                "spice-html5",
+                "spice-webdavd",
+            ]
+        }
+    ),
+    (
+        '^CRB$', {
+            '*': [
+                "spice-glib-devel",
+                "spice-gtk3-devel",
+                "spice-server-devel",
             ]
         }
     ),
@@ -126,18 +117,23 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
-                "glibc-gconv-extra.i686",
+                "kdump-utils",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
+                "smartmontools-selinux",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^extras-common$', {
             '*': [
                 "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
             ]
         }
     )

x86_64/modules_defaults/module_defaults/maven.yaml

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

x86_64/modules_defaults/module_defaults/nginx.yaml

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

x86_64/modules_defaults/module_defaults/nodejs.yaml

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

x86_64/modules_defaults/module_defaults/php.yaml

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

x86_64/modules_defaults/module_defaults/postgresql.yaml

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

x86_64/modules_defaults/module_defaults/redis.yaml

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

x86_64/modules_defaults/module_defaults/ruby.yaml

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

x86_64/modules_defaults/module_defaults/swig.yaml

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

x86_64/multilib.conf

@@ -1,41 +1,3 @@
-multilib_blacklist = {
+multilib_blacklist = {}
-    "*": [
-        "libvirt*",  # RhBug 1571159
-        "java-*", # RCM-28652
-        "totem", #RCM-43729
-        "ocaml*", # RCM-53665
-        "fwupd*", # ENGCMP-488
-        "freeradius*", #RhBug 1923990
-        "httpd-*", #ENGCMP-716
-        "nginx-*",
-        "php-*",
-        "subversion-*",
-        "mariadb-common", #ENGCMP-1061
-        "mariadb-devel",
-        "mariadb-embedded*",
-        "mariadb-errmsg",
-        "mysql-common",
-        "mysql-devel",
-        "mysql-libs",
-        "mecab",
-        "postgresql-private*", #ENGCMP-1179
-        "postgresql-server*",
-        "bash*", #RhBug 2006138
-        "xapian-core*", #RhBug 2031780
-        "tk*", #RhBug 2053406
-        "tcl*",
-        "ldns-devel*", #RhBug 2058694
-        "apr-util-openssl",
-        "compiler-rt",
-        "libomp",
-        "librevenge-gdb",
-        "tracker",
-        "tracker-miners",
-    ],
-}
 multilib_whitelist = {}
-multilib = [
+multilib = []
-    ('^.*$', {
-        'x86_64': ['devel', 'runtime']
-    }),
-]

x86_64/variants.xml

@@ -56,7 +56,6 @@
       <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>
@@ -70,7 +69,6 @@
       <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>
@@ -80,18 +78,14 @@
       <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>
@@ -104,7 +98,6 @@
       <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>
@@ -124,16 +117,6 @@
       <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>
@@ -142,9 +125,6 @@
     <groups>
       <group default="false">crb</group>
     </groups>
-    <modules>
-      <module>swig:4.1</module>
-    </modules>
   </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
@@ -155,37 +135,6 @@
       <group default="true">ha-devel</group>
     </groups>
   </variant>
-  <variant id="ResilientStorage" name="ResilientStorage" type="variant">
-    <arches>
-      <arch>x86_64</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>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>
@@ -249,21 +198,30 @@
       <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-common" name="extras-common" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+  </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,18 +2,18 @@
     "BaseOS": {
         "gather_methods": "hybrid",
         "buildinstall_skip": false,
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [
                 "AppStream"
             ],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -48,7 +48,7 @@
             "AppStream"
         ]
     },
-    "ResilientStorage": {
+    "RT": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
@@ -57,7 +57,7 @@
             "AppStream"
         ]
     },
-    "extras": {
+    "NFV": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
@@ -86,37 +86,19 @@
             "HighAvailability"
         ]
     },
-    "RT": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
-    "NFV": {
-        "gather_methods": "hybrid",
-        "buildinstall_skip": true,
-        "createiso_skip": true,
-        "variant_as_lookaside": [
-            "BaseOS",
-            "AppStream"
-        ]
-    },
     "Minimal": {
         "gather_methods": "hybrid",
-        "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
         "buildinstall_skip": false,
         "createiso_skip": true,
         "extra_isos": [{
             "include_variants": [],
-            "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}",
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
             "skip_src": true,
             "extra_files": [{
                 "scm": "git",
-                "repo": "https://git.almalinux.org/rpms/almalinux-release.git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
-                "branch": "a{{ distribution_major_version }}",
+                "branch": "a{{ distribution_major_version }}s",
                 "file": [
                         "LICENSE",
                         "EULA",
@@ -125,6 +107,15 @@
             }]
         }]
     },
+    "extras-common": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream"
+        ]
+    },
     "devel": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
@@ -135,11 +126,9 @@
             "CRB",
             "SAP",
             "SAPHANA",
-            "extras",
             "Minimal",
-            "RT",
             "NFV",
-            "ResilientStorage",
+            "RT",
             "HighAvailability"
         ]
     }

x86_64_v2/include_exclude.conf

@@ -1,8 +1,9 @@
 filter_packages = [
     (
         '^(BaseOS|Minimal|AppStream|CRB)$', {
-            '*': [
+            'x86_64': [
                 "insights-client",
+                "insights-client-ros",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
                 "libreport-rhel-anaconda-bugzilla",
@@ -17,8 +18,6 @@ filter_packages = [
                 "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",
@@ -27,65 +26,35 @@ filter_packages = [
                 "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",
+                "subscription-manager-rhsm-certificates.x86_64",
+                "kernel-rt-core.x86_64",
+                "kernel-rt-modules-core.x86_64",
             ]
         }
     ),
     (
         '^(BaseOS|Minimal)$', {
-            '*': [
+            'x86_64': [
-                "perl-Net-SSLeay",
-                "perl-Mozilla-CA",
-                "perl-IO-Socket-SSL",
                 "python-unversioned-command",
-                "python.i686",
             ]
         }
     ),
     (
         '^(AppStream)$', {
-            '*': [
+            'x86_64': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
-                "libvirt-glib.i686",
                 "sos",
             ]
         }
     ),
 ]
-filter_modules = [
+filter_modules = []
-    (
-        '^AppStream$', {
-            '*': [
-                "maven:3.8",
-            ]
-        }
-    ),
-    (
-        '^devel$', {
-            '*': [
-                "javapackages-tools:202201",
-            ]
-        }
-    ),
-]
 
 additional_packages = [
     (
@@ -93,6 +62,22 @@ additional_packages = [
             '*': [
                 "almalinux-backgrounds",
                 "lorax-templates-almalinux",
+                "firefox",
+                "thunderbird",
+                "spice-gtk",
+                "spice-gtk-tools",
+                "spice-gtk3-vala",
+                "spice-html5",
+                "spice-webdavd",
+            ]
+        }
+    ),
+    (
+        '^CRB$', {
+            '*': [
+                "spice-glib-devel",
+                "spice-gtk3-devel",
+                "spice-server-devel",
             ]
         }
     ),
@@ -132,17 +117,23 @@ additional_packages = [
                 "tmux",
                 "usbguard",
                 "kernel",
+                "kdump-utils",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
+                "smartmontools-selinux",
             ]
         }
     ),
     (
-        '^extras$', {
+        '^extras-common$', {
             '*': [
                 "anaconda-live",
+                "epel-release",
+                "xisxwayland",
+                "livesys-scripts",
             ]
         }
     )

x86_64_v2/variants.xml

@@ -3,7 +3,7 @@
 <variants>
   <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
     <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</arch>
     </arches>
     <groups>
       <group default="false">additional-devel</group>
@@ -49,14 +49,13 @@
   </variant>
   <variant id="AppStream" name="AppStream" type="variant">
     <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</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>
@@ -70,7 +69,6 @@
       <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>
@@ -80,18 +78,14 @@
       <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>
@@ -104,7 +98,6 @@
       <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>
@@ -124,91 +117,27 @@
       <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>
+      <arch>x86_64_v2</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>
+      <arch>x86_64_v2</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>
+      <arch>x86_64_v2</arch>
     </arches>
     <groups>
       <group default="false">additional-devel</group>
@@ -249,20 +178,50 @@
       <environment display_order="3">minimal-environment</environment>
     </environments>
   </variant>
+  <variant id="NFV" name="NFV" type="variant">
+    <arches>
+      <arch>x86_64_v2</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_v2</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_v2</arch>
+    </arches>
+    <groups>
+      <group default="false">sap</group>
+    </groups>
+  </variant>
+  <variant id="SAPHANA" name="SAPHANA" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+    <groups>
+      <group default="false">sap-hana</group>
+    </groups>
+  </variant>
+  <variant id="extras-common" name="extras-common" type="variant">
+    <arches>
+      <arch>x86_64_v2</arch>
+    </arches>
+  </variant>
   <variant id="devel" name="devel" type="variant">
     <arches>
-      <arch>i686</arch>
+      <arch>x86_64_v2</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>

x86_64_v2/variants_options.json

@@ -1,8 +1,26 @@
 {
     "BaseOS": {
         "gather_methods": "hybrid",
-        "buildinstall_skip": true,
+        "buildinstall_skip": false,
-        "createiso_skip": true
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
+        "createiso_skip": true,
+        "extra_isos": [{
+            "include_variants": [
+                "AppStream"
+            ],
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
+        }]
     },
     "AppStream": {
         "gather_methods": "hybrid",
@@ -30,29 +48,6 @@
             "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,
@@ -62,14 +57,13 @@
             "AppStream"
         ]
     },
-    "SAP": {
+    "NFV": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
         "variant_as_lookaside": [
             "BaseOS",
-            "AppStream",
+            "AppStream"
-            "HighAvailability"
         ]
     },
     "SAPHANA": {
@@ -82,7 +76,38 @@
             "HighAvailability"
         ]
     },
-    "extras": {
+    "SAP": {
+        "gather_methods": "hybrid",
+        "buildinstall_skip": true,
+        "createiso_skip": true,
+        "variant_as_lookaside": [
+            "BaseOS",
+            "AppStream",
+            "HighAvailability"
+        ]
+    },
+    "Minimal": {
+        "gather_methods": "hybrid",
+        "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
+        "buildinstall_skip": false,
+        "createiso_skip": true,
+        "extra_isos": [{
+            "include_variants": [],
+            "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}",
+            "skip_src": true,
+            "extra_files": [{
+                "scm": "git",
+                "repo": "https://git.almalinux.org/rpms/almalinux-kitten-release.git",
+                "branch": "a{{ distribution_major_version }}s",
+                "file": [
+                        "LICENSE",
+                        "EULA",
+                        "RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
+                ]
+            }]
+        }]
+    },
+    "extras-common": {
         "gather_methods": "hybrid",
         "buildinstall_skip": true,
         "createiso_skip": true,
@@ -101,11 +126,9 @@
             "CRB",
             "SAP",
             "SAPHANA",
-            "extras",
             "Minimal",
-            "RT",
             "NFV",
-            "ResilientStorage",
+            "RT",
             "HighAvailability"
         ]
     }