add i686 buildroots

r8-i686-devel.conf

@@ -0,0 +1,160 @@
+from common/multilib import *
+from common/include-excludes import *
+
+# PRODUCT INFO 
+release_name = "Rocky Development" 
+release_short = "Rocky-i686-devel"
+release_version = "8"
+version = "8-devel"
+
+skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files']
+
+# GENERAL SETTINGS
+ comps_file = {
+         'scm': 'git',
+         'repo': 'https://git.rockylinux.org/rocky/comps.git',
+         'branch': 'main',
+         'file': 'comps-rocky-8.4.xml',
+ }
+
+#link_type = 'hardlink-or-copy'
+link_type = 'copy'
+
+module_defaults_dir = {
+        'scm': 'git',
+        'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
+        'branch': 'r8.4',
+        'dir': '.',
+}
+
+multilib = [
+    ('^.*$', {
+        'x86_64': ['devel', 'runtime']
+    }),
+]
+
+variants_file = 'variants-i686-devel.xml'
+sigkeys = ['6D745A60']
+hashed_directories = True
+
+# tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
+tree_arches = ['i686']
+
+# PKGSET
+pkgset_source = "koji"
+koji_profile = "koji"
+
+# PKGSET - KOJI
+pkgset_koji_tag = "dist-rocky8-compose"
+pkgset_koji_inherit = False
+pkgset_koji_module_tag = "modular-updates-candidate"
+
+filter_system_release_packages = False
+
+# GATHER
+gather_prepopulate = "rocky-packages.json"
+
+gather_method = {
+        "^(?!(AppStream|PowerTools)).*$":{
+                "comps": "deps"
+        },
+        "^(AppStream|PowerTools)$": "hybrid",
+}
+
+gather_backend = "dnf"
+check_deps = False
+greedy_method = "none"
+repoclosure_backend = "dnf"
+
+# CREATEREPO
+createrepo_deltas = False
+createrepo_database = True
+createrepo_c = True
+createrepo_checksum = "sha256"
+createrepo_use_xz = True
+createrepo_num_threads = 8
+createrepo_num_workers = 4
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+create_jigdo = False
+
+
+buildinstall_skip = [
+    ("^(Devel|AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
+       "*": True
+       }),
+]
+
+# LOOKASIDE
+variant_as_lookaside = [
+]
+
+gather_lookaside_repos = [
+    ("^Devel$", {
+        "x86_64": [
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/x86_64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/x86_64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/x86_64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/x86_64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/x86_64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/x86_64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/source/tree",
+        ],
+        "ppc64": [
+        ],
+        "ppc64le": [
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/ppc64le/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/ppc64le/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/ppc64le/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/ppc64le/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/ppc64le/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/ppc64le/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/source/tree",
+        ],
+        "s390x": [
+        ],
+        "aarch64": [
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/aarch64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/aarch64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/aarch64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/aarch64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/aarch64/os",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/aarch64/debug/tree",
+            "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/source/tree",
+        ],
+    }),
+]
+
+productimg = False
+
+translate_paths = [
+	("/mnt/koji", "https://koji.rockylinux.org/kojifiles")
+	# ("/compose", "http://172.22.0.123/compose"),
+]
+

r8-i686-updates.conf

@@ -0,0 +1,3 @@
+from r8-i686 import *
+#from images import *
+release_type = 'updates'

r8-i686.conf

@@ -0,0 +1,184 @@
+from common/multilib import *
+from common/include-excludes import *
+#from images import *
+
+# PRODUCT INFO 
+release_name = "Rocky Linux" 
+release_short = "Rocky-i686"
+release_version = "8"
+version = "8.4"
+
+# GENERAL SETTINGS
+comps_file = {
+        'scm': 'git',
+        'repo': 'https://git.rockylinux.org/rocky/comps.git',
+        'branch': 'main',
+        'file': 'comps-rocky-8.4-i686.xml',
+}
+
+#link_type = 'hardlink-or-copy'
+link_type = 'copy'
+
+module_defaults_dir = {
+        'scm': 'git',
+        'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
+        'branch': 'r8.4',
+        'dir': '.',
+}
+
+multilib = [
+    ('^.*$', {
+        'x86_64': ['devel', 'runtime']
+    }),
+]
+
+variants_file = 'variants-i686.xml'
+sigkeys = ['6D745A60']
+# Change to true for 8.5
+hashed_directories = False
+
+tree_arches = ['i686']
+
+# RUNROOT SETTINGS
+runroot_channel = 'image'
+runroot_tag = 'dist-rocky8-build'
+runroot_method = 'koji'
+
+# PKGSET
+pkgset_source = "koji"
+koji_profile = "koji"
+
+# PKGSET - KOJI
+pkgset_koji_tag = "dist-rocky8-compose"
+pkgset_koji_inherit = False
+pkgset_koji_module_tag = "dist-rocky8-module-compose"
+#pkgset_allow_reuse = False
+pkgset_allow_reuse = True
+
+filter_system_release_packages = False
+
+createiso_break_hardlinks = True
+
+# GATHER
+gather_prepopulate = "rocky-i686-packages.json"
+
+gather_method = {
+        "^(?!(AppStream|PowerTools)).*$":{
+                "comps": "deps"
+        },
+        "^(AppStream|PowerTools)$": "hybrid",
+}
+
+gather_backend = "dnf"
+check_deps = False
+greedy_method = "none"
+repoclosure_backend = "dnf"
+
+# CREATEREPO
+createrepo_deltas = False
+createrepo_database = True
+createrepo_c = True
+createrepo_checksum = "sha256"
+createrepo_use_xz = True
+createrepo_num_threads = 8
+createrepo_num_workers = 8
+createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.4']
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+create_jigdo = False
+
+# BUILDINSTALL
+bootable = True
+buildinstall_method = "lorax"
+
+lorax_options = [
+    ("^.*$", {
+        "*": {
+            "noupgrade": False,
+            "rootfs_size": 3,
+            "version": "8"
+        }
+    })
+]
+
+buildinstall_skip = [
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT)$", {
+       "*": True
+       }),
+]
+
+image_name_format = {
+    "^BaseOS$": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
+    "^Minimal$": "{release_short}-8.4-{arch}-minimal{suffix}",
+    ".*": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
+}
+
+image_volid_formats = [ '{release_short}-8.4-{arch}-{disc_type}', ]
+
+# CREATEISO
+create_optional_isos = False
+
+createiso_skip = [
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|RT)$', {
+        '*': True,
+        'src':True
+    }),
+]
+
+extra_isos = {
+    "BaseOS": [{
+        "include_variants": ["AppStream"],
+        "filename": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
+        "skip_src": True,
+    }],
+    "Minimal": [{
+        "include_variants": ["BaseOS"],
+        "filename": "{release_short}-8.4-{arch}-minimal{suffix}",
+        "skip_src": True,
+    }]
+}
+
+
+restricted_volid = True
+
+# LOOKASIDE
+variant_as_lookaside = [
+    ('AppStream', 'BaseOS'),
+    ('PowerTools', 'BaseOS'),
+    ('PowerTools', 'AppStream'),
+    ('HighAvailability', 'BaseOS'),
+    ('HighAvailability', 'AppStream'),
+    ("ResilientStorage", "BaseOS"),
+    ("ResilientStorage", "AppStream"),
+#    ("NFV", "BaseOS"),
+#    ("NFV", "AppStream"),
+]
+
+extra_files = [
+    ("^.*$", {
+        "*": [
+            {
+                "scm": "git",
+                "repo": "https://git.rockylinux.org/original/rpms/rocky-release.git",
+                "branch": "r8",
+                "file": [
+                    'SOURCES/LICENSE',
+                    'SOURCES/EULA',
+                    'SOURCES/COMMUNITY-CHARTER',
+                    'SOURCES/RPM-GPG-KEY-rockyofficial',
+                ],
+                "target": "",
+            },
+        ]
+    }),
+]
+
+productimg = False
+
+translate_paths = [
+	("/mnt/koji", "https://koji.rockylinux.org/kojifiles")
+	#("/compose", "http://172.22.0.123/compose"),
+]
+

scripts/updates-8-i686-devel.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+source "$(dirname "$0")/common-8"
+export PATH=/usr/sbin:/usr/bin:/root/bin
+TARGET_DIR="/mnt/compose/8"
+SHORT=i686-Devel
+CONFIG=/etc/pungi-prod-32/r8-i686-devel.conf
+# Unused for now
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
+SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
+LABEL="--production --no-label"
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
+#COMPOSE_ID="Rocky-8-20210625.n.0"
+
+if [ -z "$COMPOSE_ID" ]; then
+  CMD="$CMD --target-dir=$TARGET_DIR"
+else
+  CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
+fi
+
+time $CMD

scripts/updates-8-i686.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+source "$(dirname "$0")/common-8"
+export PATH=/usr/sbin:/usr/bin:/root/bin
+TARGET_DIR="/mnt/compose/8"
+SHORT=Rocky-i686
+CONFIG=/etc/pungi-prod/r8-i686-updates.conf
+# Unused for now
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
+SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
+LABEL="--production --label RC-8.4"
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
+#COMPOSE_ID="Rocky-8-20210625.n.0"
+
+if [ -z "$COMPOSE_ID" ]; then
+  CMD="$CMD --target-dir=$TARGET_DIR"
+else
+  CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
+fi
+
+time $CMD

variants-i686-devel.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variants PUBLIC "-//Rocky, Inc.//DTD Variants info//EN" "variants2012.dtd">
+<variants>
+  <variant id="Devel" name="Devel" type="variant" has_optional="false">
+    <!-- List of architectures for BaseOS compose variant -->
+    <arches>
+      <arch>i686</arch>
+    </arches>
+  </variant>
+</variants>

variants-i686.xml

@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
+<variants>
+  <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
+    <!-- List of architectures for BaseOS compose variant -->
+    <arches>
+      <arch>i686</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">binary-intentionally-in-rhel-8</group>
+      <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">dns-server</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">
+    <!-- List of architectures for AppStream compose variant -->
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <!-- List of comps groups that should be part of AppStream compose variant -->
+    <groups>
+      <group default="true">nonmodular-appstream</group>
+      <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">debugging</group>
+      <group default="true">development</group>
+      <group default="true">dotnet-core</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">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">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">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>
+    <!-- List of modules that should be part of AppStream compose variant -->
+    <modules>
+      <module>389-ds:1.4</module>
+      <module>ant:1.10</module>
+      <module>perl-App-cpanminus:1.7044</module>
+      <module>perl-DBD-MySQL:4.046</module>
+      <module>perl-DBD-Pg:3.7</module>
+      <module>perl-DBD-SQLite:1.58</module>
+      <module>perl-DBI:1.641</module>
+      <module>perl-IO-Socket-SSL:2.066</module>
+      <module>perl-libwww-perl:6.34</module>
+      <module>container-tools:1.0</module>
+      <module>container-tools:2.0</module>
+      <module>container-tools:3.0</module>
+      <module>container-tools:rhel8</module>
+      <module>freeradius:3.0</module>
+      <module>gimp:2.8</module>
+      <module>go-toolset:rhel8</module>
+      <module>httpd:2.4</module>
+      <module>idm:DL1</module>
+      <module>idm:client</module>
+      <module>inkscape:0.92.3</module>
+      <module>javapackages-runtime:201801</module>
+      <module>jmc:rhel8</module>
+      <module>libselinux-python:2.8</module>
+      <module>llvm-toolset:rhel8</module>
+      <module>mailman:2.1</module>
+      <module>mariadb:10.3</module>
+      <module>mariadb:10.5</module>
+      <module>maven:3.5</module>
+      <module>maven:3.6</module>
+      <module>mercurial:4.8</module>
+      <module>mod_auth_openidc:2.3</module>
+      <module>mysql:8.0</module>
+      <module>nginx:1.14</module>
+      <module>nginx:1.16</module>
+      <module>nginx:1.18</module>
+      <module>nodejs:10</module>
+      <module>nodejs:12</module>
+      <module>nodejs:14</module>
+      <module>parfait:0.5</module>
+      <module>perl:5.24</module>
+      <module>perl:5.26</module>
+      <module>perl:5.30</module>
+      <module>perl-FCGI:0.78</module>
+      <module>php:7.2</module>
+      <module>php:7.3</module>
+      <module>php:7.4</module>
+      <module>pki-core:10.6</module>
+      <module>pki-deps:10.6</module>
+      <module>pmdk:1-fileformat-v6</module>
+      <module>postgresql:10</module>
+      <module>postgresql:9.6</module>
+      <module>postgresql:12</module>
+      <module>postgresql:13</module>
+      <module>python27:2.7</module>
+      <module>python36:3.6</module>
+      <module>python38:3.8</module>
+      <module>python39:3.9</module>
+      <module>redis:5</module>
+      <module>redis:6</module>
+      <module>rhn-tools:1.0</module>
+      <module>ruby:2.5</module>
+      <module>ruby:2.6</module>
+      <module>ruby:2.7</module>
+      <module>rust-toolset:rhel8</module>
+      <module>satellite-5-client:1.0</module>
+      <module>scala:2.10</module>
+      <module>squid:4</module>
+      <module>subversion:1.10</module>
+      <module>subversion:1.14</module>
+      <module>swig:3.0</module>
+      <module>swig:4.0</module>
+      <module>varnish:6</module>
+      <module>virt:rhel</module>
+      <module>perl-YAML:1.24</module>
+    </modules>
+
+  </variant>
+
+  <variant id="Minimal" name="Minimal" type="variant">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="true">core</group>
+    </groups>
+    <environments>
+      <environment display_order="3">minimal-environment</environment>
+    </environments>
+  </variant>
+
+
+  <variant id="PowerTools" name="PowerTools" type="variant">
+    <!-- List of architectures for Powertools compose variant -->
+    <arches>
+      <arch>i686</arch>
+    </arches>
+    <groups>
+      <group default="true">rocky-powertools</group>
+    </groups>
+    <modules>
+      <module>javapackages-tools:201801</module>
+      <module>mariadb-devel:10.3</module>
+      <module>virt-devel:rhel</module>
+      <module>python38-devel:3.8</module>
+      <module>python39-devel:3.9</module>
+    </modules>
+  </variant>
+
+  <!-- ADDONS (Defined as variants in RHEL-8) -->
+
+  <variant id="ResilientStorage" name="Resilient Storage" type="variant">
+    <arches>
+      <arch>i686</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>i686</arch>
+    </arches>
+    <groups>
+      <group default="true">ha</group>
+      <group default="true">ha-devel</group>
+    </groups>
+  </variant>
+  <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+  </variant>
+
+  <!-- Live Variants, loosely borrowed from Fedora
+       Usually these variants are set to always be empty -->
+  <variant id="Workstation" name="Workstation" type="variant" is_empty="true">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+  </variant>
+  <variant id="Spins" name="Spins" type="variant" is_empty="true">
+    <arches>
+      <arch>i686</arch>
+    </arches>
+  </variant>
+
+</variants>