From a1f619502280f0c2b95ae600ec48d66ad647db73 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Feb 27 2018 18:23:31 +0000
Subject: Merge #530 `Enable Atomic, Cloud and Container composes on s390x in f28`


---

diff --git a/fedora.conf b/fedora.conf
index 4cf39fa..e6d5ab1 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -294,7 +294,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Base',
@@ -314,7 +314,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base-minimal.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Minimal_Base',
@@ -336,11 +336,11 @@ image_build = {
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
-                    'failable': ['aarch64', 'ppc64', 'ppc64le'],
+                    'failable': ['aarch64', 'ppc64', 'ppc64le', 's390x'],
                      }
         },
         {
@@ -364,7 +364,7 @@ image_build = {
                     'kickstart': 'fedora-atomic.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 6,
-                    'arches': ['aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic',
                     'failable': ['*'],
@@ -744,6 +744,15 @@ ostree = [
             "repo": "Everything",
             "ostree_repo": "/mnt/koji/compose/atomic/28/",
             '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": "f28",
+            "repo": "Everything",
+            "ostree_repo": "/mnt/koji/compose/atomic/28/",
+            'failable': ['*'],
         }
     }),
     ("^ostree$", {
@@ -811,6 +820,23 @@ ostree_installer = [
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'f28',
             '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/28/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/28/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora/28/s390x/atomic-host",
+                "ostree_update_ref=fedora/28/s390x/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+            'failable': ['*'],
         }
     }),
     ("^WorkstationOstree$", {
diff --git a/variants-fedora.xml b/variants-fedora.xml
index fbdef4a..1f52f4e 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -6,6 +6,7 @@
             <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">
@@ -14,6 +15,7 @@
             <arch>i386</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -23,6 +25,7 @@
             <arch>armhfp</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -142,6 +145,7 @@
             <arch>aarch64</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
         <groups>