From 62b46e73bb9d17caf5036913f564ea639c0d946a Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: May 12 2020 18:02:57 +0000
Subject: start on pungi configs for 8.2.2004


---

diff --git a/c8.conf b/c8.conf
index 774f97b..855ddda 100644
--- a/c8.conf
+++ b/c8.conf
@@ -6,14 +6,14 @@ from include-excludes import *
 release_name = "CentOS Linux" 
 release_short = "CentOS"
 release_version = "8"
-version = "8.1.1911"
+version = "8.2.2004"
 
 # GENERAL SETTINGS
 comps_file = {
         'scm': 'git',
         'repo': 'https://git.centos.org/centos/comps.git',
         'branch': 'master',
-        'file': 'comps-centos-8.1.0.1911.xml',
+        'file': 'comps-centos-8.2.0.2004.xml',
 }
 
 link_type = 'hardlink-or-copy'
@@ -21,7 +21,7 @@ link_type = 'hardlink-or-copy'
 module_defaults_dir = {
         'scm': 'git',
         'repo': 'https://git.centos.org/centos/centos-module-defaults.git',
-        'branch': 'c8.1',
+        'branch': 'c8.2',
         'dir': '.',
 }
 
@@ -76,7 +76,7 @@ createrepo_checksum = "sha256"
 createrepo_use_xz = True
 createrepo_num_threads = 8
 createrepo_num_workers = 4
-createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.1.1911']
+createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.2.2004']
 
 # CHECKSUMS
 media_checksums = ['sha256']
@@ -104,17 +104,18 @@ buildinstall_skip = [
 ]
 
 image_name_format = {
-    "^BaseOS$": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}",
-    ".*": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}",
+    "^BaseOS$": "{release_short}-8.2.2004-{arch}-{disc_type}{disc_num}{suffix}",
+    "^Minimal$": "{release_short}-8.2.2004-{arch}-minimal{suffix}",
+    ".*": "{release_short}-8.2.2004-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
-image_volid_formats = [ '{release_short}-8.1.1911-{arch}-{disc_type}', ]
+image_volid_formats = [ '{release_short}-8.2.2004-{arch}-{disc_type}', ]
 
 # CREATEISO
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|CR)$', {
         '*': True,
         'src':True
     }),
@@ -125,8 +126,13 @@ extra_isos = {
         "include_variants": ["AppStream"],
         "filename": "{release_short}-8.1.1911-{arch}-{disc_type}{disc_num}{suffix}",
         "skip_src": True,
+    }],
+    "Minimal": [{
+        "filename": "{release_short}-8.2.2004-{arch}-minimal{suffix}",
+        "skip_src": True,
     }]
 }
+}
 
 restricted_volid = True
 
diff --git a/variants.xml b/variants.xml
index addab7a..3c521f7 100644
--- a/variants.xml
+++ b/variants.xml
@@ -205,6 +205,25 @@
 
   </variant>
 
+  <variant id="Minimal" name="Minimal" type="variant">
+    <arches>
+      <arch>aarch64</arch>
+      <arch>x86_64</arch>
+      <arch>ppc64le</arch>
+    </arches>
+    <groups>
+      <group default="true">guest-agents</group>
+      <group default="true">standard</group>
+      <group default="true">base</group>
+      <group default="true">core</group>
+      <group default="true">server-product</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>