From d8be03fa18cbbd5d98b2089b1da9c429973ee0f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Tue, 6 Feb 2018 10:56:10 +0100
Subject: [PATCH] Update Rawhide config to build a modular variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should cause the compose to contain all the previous content plus a
separate Modular variant with packages specified by list of modules in
variants file.

The final layout of the compose should be like this:

    compose/Everything/$arch/os/
    compose/Modular/$arch/os/

Relates: https://pagure.io/releng/issue/7227
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 fedora.conf         |  8 ++++++--
 variants-fedora.xml | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/fedora.conf b/fedora.conf
index c8564c5..cd4c49e 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -46,8 +46,12 @@ pkgset_koji_inherit = False
 filter_system_release_packages = False
 
 # GATHER
-gather_source = 'comps'
-gather_method = 'deps'
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
 gather_backend = 'dnf'
 gather_profiler = True
 check_deps = False
diff --git a/variants-fedora.xml b/variants-fedora.xml
index f93c011..cc191bb 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -180,4 +180,23 @@
             <package>fedora-productimg-cloud</package>
         </buildinstallpackages>
     </variant>
+    <variant id="Modular" name="Modular" type="variant">
+        <arches>
+            <arch>armhfp</arch>
+            <arch>aarch64</arch>
+            <arch>i386</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>s390x</arch>
+            <arch>x86_64</arch>
+        </arches>
+        <modules>
+            <module>django-1.6</module>
+            <module>reviewboard-2.5</module>
+            <module>reviewboard-3.0</module>
+            <module>nodejs-6</module>
+            <module>nodejs-8</module>
+            <module>nodejs-9</module>
+        </modules>
+    </variant>
 </variants>