From 6c05c18c0222850b43292f739eeafdb6dfc66269 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Aug 26 2019 16:55:40 +0000
Subject: drop publishing i686 trees ( https://fedoraproject.org/wiki/Releases/31/ChangeSet#No_i686_Repositories )


Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/fedora.conf b/fedora.conf
index b7c73b3..f5d1d49 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -25,7 +25,7 @@ sigkeys = ['12C944D0']
 
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64le', 's390x', 'x86_64']
+tree_arches = ['aarch64', 'armhfp', 'ppc64le', 's390x', 'x86_64']
 
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
diff --git a/nightly.sh b/nightly.sh
index be3d70e..fffead7 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -164,12 +164,12 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWC
 if [ ! -d "$RSYNCSECTARGET" ]; then
   mkdir "$RSYNCSECTARGET"
 fi
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
     --variant Everything --variant Cloud --variant Container \
     --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
     --variant Everything --variant Cloud --variant Container \
     --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
diff --git a/variants-fedora.xml b/variants-fedora.xml
index badea93..f77ab64 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -22,7 +22,6 @@
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
-            <arch>i386</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>
@@ -90,7 +89,6 @@
         <arches>
             <arch>armhfp</arch>
             <arch>aarch64</arch>
-            <arch>i386</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>