pungi for r9

2022-02-26 09:54:09 -07:00 · 2022-02-26 09:54:09 -07:00 · 40ba786638
parent e941269e22
commit 40ba786638
20 changed files with 48726 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -11,4 +11,5 @@ in flux than those in the root folder. When a point release drops, the
 configs will then be brought down into the root folder to prepare for
 updates and new composes.

-Note that Rocky Linux 9 is not ready yet.
+Note that Rocky Linux 9 is not ready yet and the new build system will
+be translating this data. Actual pungi will *not* be used.
--- a/prepopulate.json
+++ b/prepopulate.json
--- a/rocky.conf
+++ b/rocky.conf
@ -0,0 +1,8 @@
+from shared/variables import *
+from rocky/variables import *
+from shared/all import *
+from rocky/override import *
+
+global_release = '!RELEASE_FROM_DATE_RESPIN'
+
+sigkeys = [None]
--- a/rocky/override.conf
+++ b/rocky/override.conf
@ -0,0 +1,17 @@
+# This files overrides default variables defined in the configs in
+# the ../shared directory.
+
+#from images import *
+
+# Unsigned builds for now
+sigkeys = [None]
+
+tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
+
+create_jigdo = False
+
+lorax_use_koji_plugin = False
+
+translate_paths = [ # required by image-build
+    ("/mnt/koji", "https://koji.rockylinux.org/kojifiles")
+]
--- a/rocky/variables.conf
+++ b/rocky/variables.conf
@ -0,0 +1,51 @@
+# This file sets the values of variables defined in
+# the `../shared/variables.conf`.
+
+RELEASE_NAME = 'Rocky Linux'
+RELEASE_SHORT = 'Rocky'
+RELEASE_VERSION = '9'
+VERSION = '9.0'
+
+PKGSET_KOJI_TAG = 'r9-pending'
+PKGSET_KOJI_MODULE_TAG = 'el9-modules-pending'
+
+RUNROOT_CHANNEL = 'runroot'
+RUNROOT_TAG = 'r9-build'
+
+COMPS_REPO = 'https://git.rockylinux.org/rocky/comps.git'
+COMPS_BRANCH = 'main'
+COMPS_FILE = 'comps-rocky-%s.xml' % VERSION
+
+MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git'
+MODULE_DEFAULTS_BRANCH = 'r9.0'
+
+VARIANTS_SCM = 'git'
+VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+VARIANTS_BRANCH = 'r%s' % RELEASE_VERSION
+VARIANTS_FILE = 'variants.xml'
+
+GATHER_PREPOPULATE_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+GATHER_PREPOPULATE_BRANCH = 'r%s'% RELEASE_VERSION
+GATHER_PREPOPULATE_FILE = 'prepopulate.json'
+GATHER_PREPOPULATE_COMMAND = ''
+
+EXTRA_FILES = [ 
+    {
+        "scm": "git",
+        "repo": "https://git.rockylinux.org/original/rpms/rocky-release.git",
+        "branch": "r9",
+        "file": [
+            "SOURCES/LICENSE",
+            "SOURCES/EULA",
+            "SOURCES/COMMUNITY-CHARTER",
+            "SOURCES/RPM-GPG-KEY-rockyofficial",
+        ],
+        "target": "",
+    }
+]
+
+EXTRA_BUILDINSTALL_SKIP = ('^BaseOS$', {
+    'i386': True,
+})
+
+EXTRA_ISO_ARCHES = ['aarch64', 'ppc64le', 's390x', 'x86_64']
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@ -0,0 +1,257 @@
+filter_packages = [
+     ("^(BaseOS|AppStream|CRB|HighAvailability|ResilientStorage|SAP|SAPHANA)$", {
+         "*": [
+             "kernel-rt*", #RhBug 1973568
+             "javapackages-bootstrap", #CS-636
+         ]
+     }),
+
+     ("^.*$", {
+         "*": [
+             "glibc32",
+             "libgcc32",
+             "scap-security-guide-rule-playbooks",
+             "*openh264*",      # https://fedoraproject.org/wiki/Non-distributable-rpms
+             "python3-openipmi", #RhBug 1982794
+             "OpenIPMI-perl", #RhBug 1982794
+         ]
+         "ppc64le": [
+             "SLOF",
+             "guestfs-tools",
+             "libguestfs",
+             "libvirt-daemon-kvm",
+             "libvirt-daemon-driver-qemu",
+             "qemu-kiwi",
+             "qemu-kvm",
+             "supermin",
+             "virt-manager",
+             "virt-v2v",
+             "virt-p2v",
+             "virt-top",
+             "cockpit-machines",
+         ],
+       "s390x": [
+             "rust-std-static-wasm32-unknown-unknown", #ENGCMP-1255
+             "rust-std-static-wasm32-wasi",
+         ],
+     }),
+
+]
+
+
+additional_packages = [
+    # Everything contains everything.
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+    ("^BaseOS$", {
+        "*": [
+            "python3.*-debuginfo", #ENGCMP-1433
+        ]
+    }),
+    ("^BaseOS$", {
+         "aarch64": [
+             "grub2-efi-x64-modules", #RhBug1997734
+             "grub2-efi-aa64-modules", #RhBug1997734
+         ],
+         "ppc64le": [
+             "grub2-efi-x64-modules", #RhBug1997734
+             "grub2-efi-aa64-modules", #RhBug1997734
+         ],
+         "x86_64": [
+             "biosdevname", #ENCGMP-458
+             "grub2-efi-x64-modules", #RhBug1997734
+             "grub2-efi-aa64-modules", #RhBug1997734
+         ],
+         "s390x": [
+             "openssl-ibmca", #RhBug 1916681
+             "kernel-zfcpdump", #RhBug 1981836
+             "kernel-zfcpdump-core",
+             "kernel-zfcpdump-modules",
+             "kernel-zfcpdump-modules-extra",
+         ],
+     }),
+    ("^AppStream$", {
+        "*": [
+            "afterburn-dracut", #ENGCMP-1791
+            "afterburn", #ENGCMP-1791
+            "bootupd", #ENGCMP-1787
+            "butane", #ENGCMP-1893
+            "console-login-helper-messages", #ENGCMP-1802
+            "console-login-helper-messages-issuegen", #ENGCMP-1802/CS-1007
+            "console-login-helper-messages-motdgen", #ENGCMP-1802/CS-1007
+            "console-login-helper-messages-profile", #ENGCMP-1802/CS-1007
+            "fdo-admin-cli", #ENGCMP-1993
+            "mypaint-brushes", #ENGCMP-1873
+            "ssh-key-dir", #ENGCMP-1789
+            "system-backgrounds",
+        ]
+    }),
+    ("^AppStream$", {
+         "x86_64": [
+             "qemu-kvm-ui-opengl", #RhBug 1951493
+             "supermin",
+             "libguestfs-bash-completion", #RhBug 1932821
+             "libguestfs-rescue",
+             "libguestfs-rsync",
+             "libguestfs-winsupport",
+             "virt-dib",
+             "virt-p2v",
+             "virt-v2v",
+             "virt-v2v-bash-completion",
+             "virtio-win",
+             "libreoffice-filters", #ENGCMP-759
+             "libreoffice-gtk3",
+             "libreoffice-xsltfilter",
+             "libreofficekit",
+             "libreoffice-langpack-*",
+             "libreoffice-help-*",
+             "python3-libguestfs", #RhBug 2019914
+             "redfish-finder", #RhBug 1954620
+             "opa-address-resolution", #RhBug 1924903
+             "opa-fastfabric",
+             "opa-libopamgt",
+             "opa-fm", #RhBug 1924901
+             "cockpit-machines",
+             "mvapich2-psm2", #RhBug 1974837
+             "flashrom",
+             "fwupd-plugin-flashrom",
+             "libreoffice-gdb-debug-support",
+             "libmad",
+             "vorbis-tools",
+             "eth-tools-basic",
+             "eth-tools-fastfabric",
+             "mpitests-mvapich2-psm2", #RhBug 1974837
+             "rust-std-static-wasm32-unknown-unknown",
+             "rust-std-static-wasm32-wasi",
+             "qemu-kvm-block-curl", #ENGCMP-1697
+             "aspnetcore-runtime-6.0", #CS-1025
+             "aspnetcore-targeting-pack-6.0", #CS-1025
+             "dotnet-apphost-pack-6.0", #CS-1025
+             "dotnet-host", #CS-1025
+             "dotnet-hostfxr-6.0", #CS-1025
+             "dotnet-runtime-6.0", #CS-1025
+             "dotnet-sdk-6.0", #CS-1025
+             "dotnet-targeting-pack-6.0", #CS-1025
+             "dotnet-templates-6.0", #CS-1025
+             "netstandard-targeting-pack-2.1", #CS-1025
+         ],
+         "aarch64": [
+             "supermin",
+             "libguestfs-bash-completion", #RhBug 1932821
+             "libguestfs-rescue",
+             "libguestfs-rsync",
+             "libguestfs-winsupport",
+             "virt-dib",
+             "virt-p2v",
+             "virt-v2v",
+             "virt-v2v-bash-completion",
+             "redfish-finder", #RhBug 1954620
+             "opencsd", #ENGCMP-790
+             "cockpit-machines",
+             "flashrom", #ENGCMP-1019
+             "fwupd-plugin-flashrom",
+             "rust-std-static-wasm32-unknown-unknown",
+             "rust-std-static-wasm32-wasi",
+             "python3-libguestfs", #RhBug 2019914
+             "open-vm-tools",
+             "open-vm-tools-test",
+             "hyperv-tools",
+             "qemu-kvm-block-curl", #ENGCMP-1697
+             "aspnetcore-runtime-6.0", #CS-1025
+             "aspnetcore-targeting-pack-6.0", #CS-1025
+             "dotnet-apphost-pack-6.0", #CS-1025
+             "dotnet-host", #CS-1025
+             "dotnet-hostfxr-6.0", #CS-1025
+             "dotnet-runtime-6.0", #CS-1025
+             "dotnet-sdk-6.0", #CS-1025
+             "dotnet-targeting-pack-6.0", #CS-1025
+             "dotnet-templates-6.0", #CS-1025
+             "netstandard-targeting-pack-2.1", #CS-1025
+         ],
+         "s390x": [
+             "supermin",
+             "libguestfs-bash-completion", #RhBug 1932821
+             "libguestfs-rescue",
+             "libguestfs-rsync",
+             "libguestfs-winsupport",
+             "virt-dib",
+             "virt-p2v",
+             "virt-v2v",
+             "virt-v2v-bash-completion",
+             "cockpit-machines",
+             "kernel-zfcpdump-devel", #RhBug 1981836
+             "kernel-zfcpdump-devel-matched", #ENGCMP-1358
+             "python3-libguestfs", #RhBug 2019914
+             "qemu-kvm-block-curl", #ENGCMP-1697
+             "aspnetcore-runtime-6.0", #CS-1025
+             "aspnetcore-targeting-pack-6.0", #CS-1025
+             "dotnet-apphost-pack-6.0", #CS-1025
+             "dotnet-host", #CS-1025
+             "dotnet-hostfxr-6.0", #CS-1025
+             "dotnet-runtime-6.0", #CS-1025
+             "dotnet-sdk-6.0", #CS-1025
+             "dotnet-targeting-pack-6.0", #CS-1025
+             "dotnet-templates-6.0", #CS-1025
+             "netstandard-targeting-pack-2.1", #CS-1025
+         ],
+         "ppc64le": [
+             "flashrom",
+             "fwupd-plugin-flashrom",
+             "libmad",
+             "vorbis-tools",
+             "rust-std-static-wasm32-unknown-unknown",
+             "rust-std-static-wasm32-wasi",
+         ],
+
+     }),
+    ("^CRB$", {
+        "*": [
+             "ruby-doc", #ENGCMP-1556
+             "rubygem-mysql2-doc", #ENGCMP-1556
+             "rubygem-pg-doc", #ENGCMP-1556
+             "shadow-utils-subid-devel", #ENGCMP-1597
+         ], 
+        "x86_64": [
+             "efivar-devel", #RhBug 2030807
+             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+         ],
+         "aarch64": [
+             "efivar-devel", #RhBug 2030807
+             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+         ],
+         "s390x": [
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
+         ],
+         "ppc64le": [
+             "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-11-openjdk-*slowdebug*", #ENGCMP-1327
+             "java-17-openjdk-*slowdebug*", #ENGCMP-1326
+             "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-11-openjdk-*fastdebug*", #ENGCMP-1327
+             "java-17-openjdk-*fastdebug*", #ENGCMP-1326
+         ],
+     }),
+
+    ("^Buildroot$", {
+        "*": [
+            "*",
+        ]
+    }),
+]
--- a/shared/all.conf
+++ b/shared/all.conf
@ -0,0 +1,11 @@
+from general import *
+from multilib import *
+from additional_and_filter_packages import *
+from runroot import *
+from pkgset import *
+from gather import *
+from createrepo import *
+from createiso import *
+from buildinstall import *
+from lookaside import *
+from extra_isos import *
--- a/shared/buildinstall.conf
+++ b/shared/buildinstall.conf
@ -0,0 +1,32 @@
+bootable = True
+buildinstall_method = "lorax"
+lorax_options = [
+    ("^.*$", {
+        "*": {
+            "noupgrade": False,
+# Comment out until the pungi-buildinstall Koji plugin supports this option.
+#            "squashfs_only": True
+        }
+    })
+]
+
+buildinstall_skip = [
+    EXTRA_BUILDINSTALL_SKIP,
+    ('^Everything$', {
+        'i386': True,
+    }),
+    ("^(AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
+        '*': True
+    }),
+]
+
+image_name_format = {
+    # BaseOS ISO filename should not mention BaseOS, it also contains AppStream
+    # content. Addons should have the addon name though.
+    "^BaseOS$": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
+    ".*": "{compose_id}-{variant}-{arch}-{disc_type}{disc_num}{suffix}",
+}
+
+buildinstall_use_guestmount = True
+buildinstall_allow_reuse = True
+
--- a/shared/createiso.conf
+++ b/shared/createiso.conf
@ -0,0 +1,16 @@
+create_optional_isos = False
+createiso_use_xorrisofs = True
+
+createiso_skip = [
+    ("^(BaseOS|AppStream|CRB|NFV)$", {
+        # No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
+        # No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
+        # No binary or src ISOs for CRB
+        # No binary or src ISOs for NFV
+        # Note: "*" matches only binary architectures.
+        "*": True,
+        "src":True #RCM-41427 -Disable source iso generation during createiso phase
+    }),
+]
+
+restricted_volid = True
--- a/shared/createrepo.conf
+++ b/shared/createrepo.conf
@ -0,0 +1,2 @@
+createrepo_c = True
+createrepo_checksum = "sha256"
--- a/shared/extra_isos.conf
+++ b/shared/extra_isos.conf
@ -0,0 +1,12 @@
+iso_hfs_ppc64le_compatible = False
+
+extra_isos = {
+    "BaseOS": [{
+        "include_variants": ["AppStream"],
+        "filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
+        "skip_src": False,
+        "extra_files": EXTRA_FILES,
+        "arches": EXTRA_ISOS_ARCHES,
+        "failable_arches": ['i386']
+    }]
+}
--- a/shared/gather.conf
+++ b/shared/gather.conf
@ -0,0 +1,23 @@
+gather_backend = "dnf"
+check_deps = False
+
+gather_method = {
+    # Anything that is not AppStream, CRB or Buildroot should use the old depsolver
+    "^(?!(AppStream|CRB|Buildroot)).*$": {
+        "comps": "deps",
+        "json": "deps",
+    },
+    "^(AppStream|CRB|Buildroot)$": "hybrid",
+}
+
+hashed_directories = False
+gather_allow_reuse = True
+repoclosure_backend = 'dnf'
+
+gather_prepopulate = {
+    'scm': 'git',
+    'repo': GATHER_PREPOPULATE_REPO,
+    'branch': GATHER_PREPOPULATE_BRANCH,
+    'file': GATHER_PREPOPULATE_FILE,
+    'command': GATHER_PREPOPULATE_COMMAND
+}
--- a/shared/general.conf
+++ b/shared/general.conf
@ -0,0 +1,39 @@
+release_name = RELEASE_NAME
+release_short = RELEASE_SHORT
+release_version = RELEASE_VERSION
+release_is_layered = False
+
+link_type = "abspath-symlink"
+productimg = False
+
+# Wait for 60 * 20 seconds (20 minutes) for packages to sign.
+signed_packages_wait = 60
+signed_packages_retries = 20
+
+comps_file = {
+    'scm': 'git',
+    'repo': COMPS_REPO,
+    'branch': COMPS_BRANCH,
+    'file': COMPS_FILE,
+    'command': COMPS_COMMAND
+}
+
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': MODULE_DEFAULTS_REPO,
+    'branch': MODULE_DEFAULTS_BRANCH,
+    'dir': '.'
+}
+
+variants_file = {
+    "scm": "git",
+    "repo": VARIANTS_REPO,
+    "branch": VARIANTS_BRANCH,
+    "file": VARIANTS_FILE,
+}
+
+extra_files = [
+    ("^.*$", {
+        "*": EXTRA_FILES,
+    }),
+]
--- a/shared/lookaside.conf
+++ b/shared/lookaside.conf
@ -0,0 +1,19 @@
+variant_as_lookaside = [
+    ("AppStream", "BaseOS"),
+    ("HighAvailability", "BaseOS"),
+    ("HighAvailability", "AppStream"),
+    ("ResilientStorage", "BaseOS"),
+    ("ResilientStorage", "AppStream"),
+    ("RT", "BaseOS"),
+    ("RT", "AppStream"),
+    ("NFV", "BaseOS"),
+    ("NFV", "AppStream"),
+    ("CRB", "BaseOS"),
+    ("CRB", "AppStream"),
+    ("SAP", "BaseOS"),
+    ("SAP", "AppStream"),
+    ("SAP", "HighAvailability"),
+    ("SAPHANA", "BaseOS"),
+    ("SAPHANA", "AppStream"),
+    ("SAPHANA", "HighAvailability"),
+]
--- a/shared/multilib.conf
+++ b/shared/multilib.conf
@ -0,0 +1,47 @@
+multilib = [
+    ("^.*$", {
+        "x86_64": ["devel", "runtime"]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+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
+    ],
+}
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    "*": [
+         "valgrind",
+         "papi",
+         "gcc-toolset-9-valgrind", # RCM-60082
+         "p11-kit-trust", # RCM-62077
+    ],
+}
--- a/shared/pkgset.conf
+++ b/shared/pkgset.conf
@ -0,0 +1,3 @@
+pkgset_source = "koji"
+pkgset_koji_tag = PKGSET_KOJI_TAG
+pkgset_koji_module_tag = PKGSET_KOJI_MODULE_TAG
--- a/shared/runroot.conf
+++ b/shared/runroot.conf
@ -0,0 +1,10 @@
+runroot = True
+
+global_runroot_method = "koji"
+
+runroot_method = {
+    "createiso": "local"
+}
+
+runroot_channel = RUNROOT_CHANNEL
+runroot_tag = RUNROOT_TAG
--- a/shared/variables.conf
+++ b/shared/variables.conf
@ -0,0 +1,37 @@
+global RELEASE_NAME
+global RELEASE_SHORT
+global RELEASE_VERSION
+global PKGSET_KOJI_TAG
+global PKGSET_KOJI_MODULE_TAG
+global RUNROOT_CHANNEL
+global RUNROOT_TAG
+global RELEASE_VERSION
+global RELEASE_VERSION_X
+global RELEASE_VERSION_Y
+global RELEASE_VERSION_Z
+global RELEASE_VERSION_XY
+global RELEASE_VERSION_XYZ
+global COMPS_REPO
+global COMPS_BRANCH
+global COMPS_FILE
+global COMPS_COMMAND
+global MODULE_DEFAULTS_REPO
+global MODULE_DEFAULTS_BRANCH
+global VARIANTS_REPO
+global VARIANTS_BRANCH
+global VARIANTS_FILE
+global GATHER_PREPOPULATE_REPO
+global GATHER_PREPOPULATE_BRANCH
+global GATHER_PREPOPULATE_FILE
+global EXTRA_BUILDINSTALL_SKIP
+EXTRA_BUILDINSTALL_SKIP = ("^$", {"*": False})
+global GATHER_PREPOPULATE_REPO
+global GATHER_PREPOPULATE_BRANCH
+global GATHER_PREPOPULATE_FILE
+global GATHER_PREPOPULATE_COMMAND
+global EXTRA_FILES
+EXTRA_FILES = []
+global EXTRA_ISOS_ARCHES
+EXTRA_ISOS_ARCHES = []
+global IMAGE_BUILD_SCRATCH
+IMAGE_BUILD_SCRATCH = False
--- a/upcoming/README.md
+++ b/upcoming/README.md
@ -1,4 +0,0 @@
-upcoming
-========
-
-Only for upcoming releases. Configurations will be moved to the root when ready.
--- a/variants.xml
+++ b/variants.xml
@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
+<variants>
+
+    <!-- General variants built also in Fedora. -->
+
+    <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+            <arch>i386</arch>
+        </arches>
+        <!-- List of comps groups that should be part of BaseOS compose variant -->
+        <groups>
+            <!-- Essential groups for Anaconda installation -->
+            <group default="true">guest-agents</group>
+            <group default="true">standard</group>
+            <group default="true">base</group>
+            <group default="true">core</group>
+            <!-- Other groups -->
+            <group default="true">additional-devel</group>
+            <group default="false">anaconda-tools</group>
+            <group default="false">conflicts-baseos</group>
+            <group default="true">development</group>
+            <group default="true">server-product</group>
+            <group default="true">dial-up</group>
+            <group default="true">networkmanager-submodules</group>
+            <group default="true">file-server</group>
+            <group default="true">fonts</group>
+            <group default="true">gnome-desktop</group>
+            <group default="true">graphical-admin-tools</group>
+            <group default="true">hardware-monitoring</group>
+            <group default="true">hardware-support</group>
+            <group default="true">infiniband</group>
+            <group default="true">headless-management</group>
+            <group default="true">large-systems</group>
+            <group default="true">legacy-unix</group>
+            <group default="true">mail-server</group>
+            <group default="true">mainframe-access</group>
+            <group default="true">multimedia</group>
+            <group default="true">smart-card</group>
+            <group default="true">smb-server</group>
+            <group default="true">network-tools</group>
+            <group default="true">network-file-system-client</group>
+            <group default="true">network-server</group>
+            <group default="true">performance</group>
+            <group default="true">platform-devel</group>
+            <group default="true">python-web</group>
+            <group default="true">remote-system-management</group>
+            <group default="true">scientific</group>
+            <group default="true">security-tools</group>
+            <group default="true">system-tools</group>
+            <group default="true">workstation-product</group>
+        </groups>
+        <!-- List of environments from comps that should be part of BaseOS compose variant -->
+        <environments>
+            <environment display_order="3">minimal-environment</environment>
+            <environment display_order="99">custom-environment</environment>
+            <environment display_order="2">server-product-environment</environment>
+        </environments>
+    </variant>
+    <variant id="AppStream" name="AppStream" type="variant">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+            <arch>i386</arch>
+        </arches>
+        <!-- List of comps groups that should be part of AppStream compose variant -->
+        <groups>
+            <group default="true">standard</group>
+            <group default="false">anaconda-tools</group>
+            <group default="true">base</group>
+            <group default="false">conflicts-appstream</group>
+            <group default="true">core</group>
+            <group default="true">additional-devel</group>
+            <group default="true">base-x</group>
+            <group default="true">console-internet</group>
+            <group default="true">debugging</group>
+            <group default="true">development</group>
+            <group default="true">dotnet</group>
+            <group default="true">dns-server</group>
+            <group default="true">emacs</group>
+            <group default="true">file-server</group>
+            <group default="true">ftp-server</group>
+            <group default="true">gnome-apps</group>
+            <group default="true">gnome-desktop</group>
+            <group default="true">guest-desktop-agents</group>
+            <group default="true">graphical-admin-tools</group>
+            <group default="true">graphics</group>
+            <group default="true">hardware-monitoring</group>
+            <group default="true">infiniband</group>
+            <group default="true">workstation-product</group>
+            <group default="true">multimedia</group>
+            <group default="true">mail-server</group>
+            <group default="true">mainframe-access</group>
+            <group default="true">network-server</group>
+            <group default="true">network-tools</group>
+            <group default="true">container-management</group>
+            <group default="true">smb-server</group>
+            <group default="true">dial-up</group>
+            <group default="true">fonts</group>
+            <group default="true">input-methods</group>
+            <group default="true">multimedia</group>
+            <group default="true">networkmanager-submodules</group>
+            <group default="true">network-file-system-client</group>
+            <group default="true">print-client</group>
+            <group default="true">desktop-debugging</group>
+            <group default="true">internet-browser</group>
+            <group default="true">gnome-desktop</group>
+            <group default="true">guest-agents</group>
+            <group default="true">guest-desktop-agents</group>
+            <group default="true">headless-management</group>
+            <group default="true">java-platform</group>
+            <group default="true">java-development</group>
+            <group default="true">gnome-apps</group>
+            <group default="true">internet-applications</group>
+            <group default="true">office-suite</group>
+            <group default="true">performance</group>
+            <group default="true">platform-devel</group>
+            <group default="true">platform-kvm</group>
+            <group default="true">platform-microsoft</group>
+            <group default="true">platform-vmware</group>
+            <group default="true">scientific</group>
+            <group default="true">ostree-support</group>
+            <group default="true">security-tools</group>
+            <group default="true">smart-card</group>
+            <group default="true">smb-server</group>
+            <group default="true">system-tools</group>
+            <group default="true">texlive</group>
+            <group default="true">legacy-x</group>
+            <group default="true">backup-client</group>
+            <group default="true">remote-desktop-clients</group>
+            <group default="true">remote-system-management</group>
+            <group default="true">rpm-development-tools</group>
+            <group default="true">virtualization-client</group>
+            <group default="true">virtualization-hypervisor</group>
+            <group default="true">virtualization-platform</group>
+            <group default="true">virtualization-tools</group>
+            <group default="true">web-server</group>
+        </groups>
+        <!-- List of environments from comps that should be part of BaseOS compose variant -->
+        <environments>
+            <environment display_order="3">minimal-environment</environment>
+            <environment display_order="99">virtualization-host-environment</environment>
+            <environment display_order="99">custom-environment</environment>
+            <environment display_order="2">server-product-environment</environment>
+            <environment display_order="1">graphical-server-environment</environment>
+            <environment display_order="4">workstation-product-environment</environment>
+        </environments>
+        <modules>
+		<!--            <module>container-tools:latest</module> -->
+        </modules>
+    </variant>
+    <variant id="CRB" name="CodeReady Builder" type="variant">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+            <arch>i386</arch>
+        </arches>
+        <groups>
+            <group default="true">crb</group>
+        </groups>
+	<modules>
+        </modules>
+    </variant>
+
+
+    <!-- ADDONS (Defined as variants in RHEL-9) -->
+
+    <variant id="ResilientStorage" name="Resilient Storage" type="variant">
+        <arches>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <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="HighAvailability" name="High Availability" type="variant">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+        </arches>
+        <groups>
+            <group default="true">ha</group>
+            <group default="true">ha-devel</group>
+        </groups>
+    </variant>
+
+
+    <!-- Integrated Layered Products (Defined as variants in RHEL-9) -->
+
+    <variant id="SAP" name="SAP" type="variant">
+        <arches>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+        </arches>
+        <groups>
+            <group default="true">sap</group>
+        </groups>
+    </variant>
+
+    <variant id="SAPHANA" name="SAP HANA" type="variant">
+        <arches>
+            <arch>ppc64le</arch>
+            <arch>x86_64</arch>
+        </arches>
+        <groups>
+            <group default="true">sap-hana</group>
+        </groups>
+    </variant>
+
+    <variant id="RT" name="RT" type="variant">
+        <arches>
+            <arch>x86_64</arch>
+        </arches>
+        <groups>
+            <group default="true">rt</group>
+            <group default="true">rt-debug</group>
+        </groups>
+    </variant>
+
+    <variant id="NFV" name="NFV" type="variant">
+        <arches>
+            <arch>x86_64</arch>
+        </arches>
+        <groups>
+            <group default="true">rt</group>
+            <group default="true">rt-debug</group>
+            <group default="true">nfv</group>
+            <group default="true">nfv-debug</group>
+        </groups>
+    </variant>
+</variants>