From 9d29d85adc78bf133f5e9c2b80bd36574eba9d9f Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Oct 06 2020 07:29:55 +0000
Subject: ELN: Add modules from eln-modular tag to AppStream variant.


Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

---

diff --git a/fedora/override.conf b/fedora/override.conf
index e836f3c..175a2cb 100644
--- a/fedora/override.conf
+++ b/fedora/override.conf
@@ -49,7 +49,7 @@ buildinstall_skip = [
         'ppc64le': True,
         's390x': True
     }),
-    ("^(Modular|AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
+    ("^(AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
         '*': True
     }),
 ]
@@ -100,7 +100,14 @@ gather_prepopulate = {
     'command': "echo {} > prepopulate.json; ./content-resolver-to-gather-source-json; cp gather_source.json /srv/odcs"
 }
 gather_source_mapping = "/srv/odcs/gather_source.json"
-gather_method = "deps"
+
+gather_method = {
+    '^.*': {
+        'json': 'deps',
+        'comps': 'deps',
+        'module': 'nodeps',
+    }
+}
 
 # No product_id for Fedora.
 product_id_allow_missing = False
diff --git a/fedora/variables.conf b/fedora/variables.conf
index 586d94d..1cccad6 100644
--- a/fedora/variables.conf
+++ b/fedora/variables.conf
@@ -15,7 +15,7 @@ COMPS_COMMAND = "make comps-rawhide.xml"
 
 
 MODULE_DEFAULTS_REPO = "https://pagure.io/releng/fedora-module-defaults.git"
-MODULE_DEFAULTS_BRANCH = "master"
+MODULE_DEFAULTS_BRANCH = "eln"
 
 
 VARIANTS_REPO = "https://pagure.io/pungi-fedora.git"
@@ -33,5 +33,4 @@ RUNROOT_TAG = "eln-build"
 
 
 PKGSET_KOJI_TAG = "eln"
-PKGSET_KOJI_MODULE_TAG = ""
-
+PKGSET_KOJI_MODULE_TAG = "eln-modular"
diff --git a/variants.xml b/variants.xml
index c473076..51688fc 100644
--- a/variants.xml
+++ b/variants.xml
@@ -13,18 +13,6 @@
             <arch>i386</arch>
         </arches>
     </variant>
-    <variant id="Modular" name="Modular" type="variant">
-        <arches>
-            <arch>aarch64</arch>
-            <arch>ppc64le</arch>
-            <arch>s390x</arch>
-            <arch>x86_64</arch>
-            <arch>i386</arch>
-        </arches>
-        <groups>
-            <group default="true">we-do-not-have-comps-xml-yet</group>
-        </groups>
-    </variant>
     <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
         <arches>
             <arch>aarch64</arch>
@@ -48,6 +36,9 @@
         <groups>
             <group default="true">we-do-not-have-comps-xml-yet</group>
         </groups>
+        <modules>
+            <module>*</module>
+        </modules>
     </variant>
     <variant id="CRB" name="CodeReady Builder" type="variant" is_empty="true">
         <arches>