From 044556d199c0c735b22cdb05d323c8e42c61d269 Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: Dec 03 2019 22:26:37 +0000
Subject: add CR variant


---

diff --git a/c8-stream.conf b/c8-stream.conf
index 34824ec..9c0203a 100644
--- a/c8-stream.conf
+++ b/c8-stream.conf
@@ -1,6 +1,6 @@
 from multilib import *
 from include-excludes import *
-from images import *
+from stream-images import *
 from version import *
 
 # PRODUCT INFO 
@@ -8,7 +8,7 @@ release_name = "CentOS Stream"
 release_short = "CentOS"
 release_version = "Stream"
 release_is_layered = False
-version = "8"
+version = "8-stream"
 
 # GENERAL SETTINGS
 bootable = True
@@ -61,10 +61,10 @@ filter_system_release_packages = False
 gather_prepopulate = "centos-packages.json"
 
 gather_method = {
-        "^(?!(AppStream|PowerTools)).*$":{
+        "^(?!(AppStream|PowerTools|CR)).*$":{
                 "comps": "deps"
         },
-        "^(AppStream|PowerTools)$": "hybrid",
+        "^(AppStream|PowerTools|CR)$": "hybrid",
 }
 
 gather_backend = "dnf"
@@ -102,7 +102,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools)$", {
+    ("^(AppStream|PowerTools|CR|HighAvailability)$", {
        "*": True
        }),
 ]
@@ -118,7 +118,7 @@ image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ]
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|PowerTools|)$', {
+    ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', {
         '*': True,
         'src':True
     }),
diff --git a/stream-images.conf b/stream-images.conf
new file mode 100644
index 0000000..7341806
--- /dev/null
+++ b/stream-images.conf
@@ -0,0 +1,91 @@
+image_build = {
+    "^BaseOS$": [
+        {
+            "image-build": {
+                "format": [("docker", "tar.gz")],
+                "name": "CentOS-Stream-Container",
+                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
+                "kickstart": "CentOS-8-Container.ks",
+                "ksversion": "F26",
+                "distro": "Fedora-20",
+                "disk-size": "10",
+                "arches": ["x86_64","ppc64le","aarch64"],
+                "repo": [
+		     'BaseOS', 
+		     ],
+		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os',
+                "failable": ["ppc64le","aarch64"],
+            },
+            "factory-parameters": {
+                "generate_icicle": False,
+                "docker_cmd": '[ "/bin/bash" ]',
+                "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8-stream"}',
+            }
+        },
+        { 
+            "image-build": {
+                "format": [("qcow2", "qcow2")],
+                "name": "CentOS-Stream-GenericCloud",
+                "target": "image-centos-8",
+                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
+                "kickstart": "CentOS-8-GenericCloud.ks",
+                "ksversion": "F26",
+                "distro": "Fedora-20",
+                "disk-size": "10",
+                "arches": ["x86_64","ppc64le","aarch64"],
+                "repo": [
+		     'BaseOS', 
+		     'AppStream'],
+                "failable": ["ppc64le","aarch64"],
+            },
+            "factory-parameters": {
+                "generate_icicle": False,
+            }
+        },
+        {
+            "image-build": {
+                "format": [("qcow2", "qcow2")],
+                "name": "CentOS-Stream-ec2",
+                "target": "image-centos-8",
+                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
+                "kickstart": "CentOS-8-EC2.ks",
+                "ksversion": "F26",
+                "distro": "Fedora-20",
+                "disk-size": "10",
+                "arches": ["x86_64"],
+                "repo": [
+		     'BaseOS', 
+		     'AppStream'],
+                "failable": ["ppc64le","aarch64"],
+            },
+            "factory-parameters": {
+                "generate_icicle": False,
+            }
+        },
+        {
+            "image-build": {
+                "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')],
+                "name": "CentOS-Stream-Vagrant",
+                "target": "image-centos-8",
+                "ksurl": "git+https://git.centos.org/centos/kickstarts.git?#HEAD",
+                "kickstart": "CentOS-8-x86_64-Vagrant.ks",
+                "ksversion": "F26",
+                "distro": "Fedora-20",
+                "disk-size": "10",
+                "arches": ["x86_64"],
+                "repo": [
+		     'BaseOS',
+		     'AppStream'],
+                "failable": ["ppc64le","aarch64"],
+            },
+            "factory-parameters": {
+                "generate_icicle": False,
+            }
+        },
+    ]
+}
+
+translate_paths = [
+	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
+	("/compose", "http://172.22.0.123/compose"),
+]
diff --git a/variants.xml b/variants.xml
index 1f0304e..f344105 100644
--- a/variants.xml
+++ b/variants.xml
@@ -227,6 +227,189 @@
     </modules>
   </variant>
 
+  <variant id="CR" name="Continuous Release" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+      <arch>x86_64</arch>
+      <arch>ppc64le</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>
+      <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>container-tools:1.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>libselinux-python:2.8</module>
+      <module>llvm-toolset:rhel8</module>
+      <module>mailman:2.1</module>
+      <module>mariadb:10.3</module>
+      <module>maven:3.5</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>nodejs:10</module>
+      <module>nodejs:12</module>
+      <module>parfait:0.5</module>
+      <module>perl:5.24</module>
+      <module>perl:5.26</module>
+      <module>perl-FCGI:0.78</module>
+      <module>php:7.2</module>
+      <module>php:7.3</module>
+      <module>pki-core:10.6</module>
+      <module>pki-deps:10.6</module>
+      <module>postgresql:10</module>
+      <module>postgresql:9.6</module>
+      <module>python27:2.7</module>
+      <module>python36:3.6</module>
+      <module>redis:5</module>
+      <module>rhn-tools:1.0</module>
+      <module>ruby:2.5</module>
+	      <!--  <module>ruby:2.6</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>swig:3.0</module>
+      <module>varnish:6</module>
+      <module>virt:rhel</module>
+      <module>perl-YAML:1.24</module>
+    </modules>
+  </variant>
+
 
   <!-- ADDONS (Defined as variants in RHEL-8) -->