From 002d26ccf1c048d58bbdc4c17fd63c08e33e0fba Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Mar 02 2018 15:28:35 +0000
Subject: Merge #548 `sync modular bits from rawhide`


---

diff --git a/fedora.conf b/fedora.conf
index 0f0966b..f1146eb 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/nightly.sh b/nightly.sh
index 2df27c4..f74e673 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -116,20 +116,24 @@ if [ ! -d "$RSYNCTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
+    --variant Everything --variant Atomic --variant CloudImages --variant Container \
+    --variant Server --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
+    --variant Everything --variant Atomic --variant CloudImages --variant Container \
+    --variant Server --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 # aarch64 for Server and Everything is primary
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server \
+    --variant Everything --variant Server --variant CloudImages --variant Container \
+    --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant \
+    --variant Everything --variant Server --variant CloudImages --variant Container \
+    --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@@ -155,19 +159,23 @@ if [ ! -d "$RSYNCSECTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant Atomic --variant Cloud --variant CloudImages --variant Container \
+    --variant Labs --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant Atomic --variant Cloud --variant CloudImages --variant Container \
+    --variant Labs --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 # aarch64 is alternative for Atomic Cloud CloudImages Container Labs Spins Workstation
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
-    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
-    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
-    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
-    --link-dest="$RSYNCTARGET/Everything/" --delete-after
+ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
+     "$DESTDIR" "$RSYNCSECTARGET/" \
+     --variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \
+     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
+ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
+     "$DESTDIR" "$RSYNCSECTARGET/" \
+     --variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \
+     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
 
@@ -186,17 +194,5 @@ for tomail in $TOMAIL ; do
          mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 done
 
-for koji in arm ppc s390
-do
-  if [ "$koji" = "arm" ]; then
-     arches=aarch64
-  elif [ "$koji" = "ppc" ]; then
-     arches=ppc64,ppc64le
-  elif [ "$koji" = "s390" ]; then
-     arches=s390x
-  fi
-  ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/ >$DESTDIR/logs/excludearch-$koji.log
-done
-
 find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;
 
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 6d40139..34b06d9 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -176,4 +176,23 @@
           <environment display_order="10">cloud-server-environment</environment>
         </environments>
     </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>