From ab6bf7893fc51fe8da0d20bbbe71977c00c03a89 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Aug 10 2018 12:02:54 +0000
Subject: Drop ppc64 as part of https://pagure.io/releng/issue/7602


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/fedora-cloud.conf b/fedora-cloud.conf
index 36efdae..c91734f 100644
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@@ -17,7 +17,7 @@ variants_file='variants-fedora.xml'
 sigkeys = ['429476B4'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64']
+tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
 tree_variants = ['Cloud']
@@ -221,7 +221,7 @@ image_build = {
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': [
                         'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
                         'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' 
diff --git a/fedora.conf b/fedora.conf
index 5af6140..4012575 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -25,7 +25,7 @@ sigkeys = ['429476B4']
 
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 's390x', 'x86_64']
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64le', 's390x', 'x86_64']
 
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
@@ -349,11 +349,11 @@ image_build = {
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Cloud_Base',
-                    'failable': ['ppc64', 'ppc64le', 's390x'],
+                    'failable': ['ppc64le', 's390x'],
                      }
         },
         {
@@ -649,9 +649,8 @@ failable_deliverables = [
     ('^.*$', {
         # Buildinstall is non blocking
         'src': ['buildinstall'],
-        # Nothing on i386, ppc64, ppc64le blocks the compose
+        # Nothing on i386, ppc64le blocks the compose
         'i386': ['buildinstall', 'iso'],
-        'ppc64': ['buildinstall', 'iso'],
         'ppc64le': ['buildinstall', 'iso'],
         's390x': ['buildinstall', 'iso'],
     })
diff --git a/nightly.sh b/nightly.sh
index b3550d2..e4b1485 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -152,12 +152,12 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWC
 if [ ! -d "$RSYNCSECTARGET" ]; then
   mkdir "$RSYNCSECTARGET"
 fi
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
     --variant Everything --variant AtomicHost --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=ppc64 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
     --variant Everything --variant AtomicHost --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 060ec40..fba3487 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -11,7 +11,6 @@
     <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
-            <arch>ppc64</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>
@@ -21,7 +20,6 @@
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
-            <arch>ppc64</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>
@@ -32,7 +30,6 @@
             <arch>aarch64</arch>
             <arch>armhfp</arch>
             <arch>i386</arch>
-            <arch>ppc64</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>
@@ -50,7 +47,6 @@
             <arch>armhfp</arch>
             <arch>aarch64</arch>
             <arch>i386</arch>
-            <arch>ppc64</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>
@@ -138,7 +134,6 @@
             <arch>armhfp</arch>
             <arch>aarch64</arch>
             <arch>i386</arch>
-            <arch>ppc64</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>