From a3aeecdcdd4bdad5ea1275011d7ff42ff26e505b Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Jul 22 2020 21:54:07 +0000
Subject: Importing rhel 8.3 config


Moving from rhel 8.2 to rhel 8.3 config

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/c8-stream.conf b/c8-stream.conf
index 7602361..e4ecf91 100644
--- a/c8-stream.conf
+++ b/c8-stream.conf
@@ -2,7 +2,7 @@ from multilib import *
 from stream-include-excludes import *
 #from stream-images import *
 
-# PRODUCT INFO 
+# PRODUCT INFO
 release_name = "CentOS Stream" 
 release_short = "CentOS-Stream"
 release_version = "8"
@@ -17,11 +17,14 @@ comps_file = {
 }
 
 link_type = 'hardlink-or-copy'
+variants_file = 'variants-stream.xml'
+sigkeys = ['8483C65D']
+tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
 
 module_defaults_dir = {
         'scm': 'git',
         'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8.2',
+        'branch': 'c8.3',
         'dir': '.',
 }
 
@@ -31,13 +34,6 @@ multilib = [
     }),
 ]
 
-variants_file = 'variants-stream.xml'
-sigkeys = ['8483C65D']
-#sigkeys = [None]
-hashed_directories = False
-
-tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
-
 # RUNROOT SETTINGS
 runroot_channel = 'image'
 runroot_tag = 'dist-c8-build'
@@ -55,6 +51,10 @@ pkgset_koji_module_tag = "dist-c8-stream-module-compose"
 filter_system_release_packages = False
 
 # GATHER
+gather_backend = "dnf"
+check_deps = False
+greedy_method = "none"
+repoclosure_backend = "dnf"
 gather_prepopulate = "centos-stream-packages.json"
 
 gather_method = {
@@ -64,10 +64,7 @@ gather_method = {
         "^(AppStream|PowerTools|CR)$": "hybrid",
 }
 
-gather_backend = "dnf"
-check_deps = False
-greedy_method = "none"
-repoclosure_backend = "dnf"
+hashed_directories = False
 
 # CREATEREPO
 createrepo_deltas = False
@@ -101,7 +98,7 @@ lorax_options = [
 buildinstall_skip = [
     ("^(AppStream|PowerTools|CR|HighAvailability|RT)$", {
        "*": True
-       }),
+    }),
 ]
 
 image_name_format = {
@@ -166,4 +163,3 @@ translate_paths = [
 	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
 	("/compose", "http://172.22.0.123/compose"),
 ]
-
diff --git a/variants-stream.xml b/variants-stream.xml
index d485f44..5577a4c 100644
--- a/variants-stream.xml
+++ b/variants-stream.xml
@@ -56,7 +56,7 @@
     <environments>
       <environment display_order="3">minimal-environment</environment>
       <environment display_order="99">custom-environment</environment>
-      <environment display_order="1">server-product-environment</environment>
+      <environment display_order="2">server-product-environment</environment>
     </environments>
   </variant>
   <variant id="AppStream" name="AppStream" type="variant">
@@ -152,6 +152,8 @@
       <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:rhel8</module>
@@ -169,24 +171,29 @@
       <module>mailman:2.1</module>
       <module>mariadb:10.3</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>postgresql:10</module>
-      <module>postgresql:12</module>
       <module>postgresql:9.6</module>
+      <module>postgresql:12</module>
       <module>python27:2.7</module>
       <module>python36:3.6</module>
       <module>python38:3.8</module>
@@ -194,6 +201,7 @@
       <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>
@@ -226,9 +234,11 @@
       -->
       <module>mariadb-devel:10.3</module>
       <module>virt-devel:rhel</module>
+      <module>python38-devel:3.8</module>
     </modules>
   </variant>
 
+
   <!-- ADDONS (Defined as variants in RHEL-8) -->
 
   <variant id="HighAvailability" name="High Availability" type="variant">