From 3607ff8f74c67f29267f52029d911885b255f552 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Wed, 28 Feb 2018 15:14:57 +0100
Subject: [PATCH] Revert "Enable Atomic, Cloud and Docker composes on s390x in
 rawhide"

This reverts commit add1de27a79588f40978427d5415aea2420679b0.

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 fedora.conf         | 37 +++++--------------------------------
 variants-fedora.xml |  4 ----
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/fedora.conf b/fedora.conf
index dc3ae96..5fa8af4 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -301,7 +301,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64', 's390x'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Base',
@@ -321,7 +321,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base-minimal.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64', 's390x'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Minimal_Base',
@@ -343,12 +343,11 @@ image_build = {
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64', 's390x'],
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
                     'repo': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
-                    'failable': ['ppc64', 'ppc64le', 's390x'],
-
+                    'failable': ['ppc64', 'ppc64le'],
                      }
         },
         {
@@ -372,7 +371,7 @@ image_build = {
                     'kickstart': 'fedora-atomic.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 6,
-                    'arches': ['aarch64', 'ppc64le', 'x86_64', 's390x'],
+                    'arches': ['aarch64', 'ppc64le', 'x86_64'],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic',
                     'failable': ['*'],
@@ -751,15 +750,6 @@ ostree = [
             "repo": "Everything",
             "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
             'failable': ['*'],
-        },
-        "s390x": {
-            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
-            "treefile": "fedora-atomic-host.json",
-            "config_url": "https://pagure.io/fedora-atomic.git",
-            "config_branch": "master",
-            "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
-            'failable': ['*'],
         }
     }),
     ("^ostree$", {
@@ -827,23 +817,6 @@ ostree_installer = [
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'master',
             'failable': ['*'],
-        },
-        "s390x": {
-            "repo": "Everything",
-            "release": None,
-            "rootfs_size": "4",
-            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
-                             "ostree-based-installer/lorax-embed-repo.tmpl"],
-            "add_template_var": [
-                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
-                "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/rawhide/s390x/atomic-host",
-                "ostree_update_ref=fedora/rawhide/s390x/atomic-host",
-            ],
-            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
-            'failable': ['*'],
         }
     }),
     ("^WorkstationOstree$", {
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 3bc5b4a..06e3b2c 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -6,7 +6,6 @@
             <arch>aarch64</arch>
             <arch>x86_64</arch>
             <arch>ppc64le</arch>
-            <arch>s390x</arch>
         </arches>
     </variant>
     <variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">
@@ -15,7 +14,6 @@
             <arch>i386</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
-            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -25,7 +23,6 @@
             <arch>armhfp</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
-            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -145,7 +142,6 @@
             <arch>aarch64</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
-            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
         <groups>