From c87901b05a0ab47ce0c60852435865884edeb296 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 18 Feb 2016 09:40:14 -0600
Subject: [PATCH] add some missing artifacts and put others in the correct
 location

Put Docker image in its own variant, and break out the Cloud_Images
add the missing arm Spins
put the move Spins to Labs and Live to Spins

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
---
 fedora.conf | 68 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/fedora.conf b/fedora.conf
index caaa3a1..fc0c644 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -253,7 +253,7 @@ translate_paths = [
 
 
 image_build = {
-    '^Cloud$': [
+    '^Docker$': [
         {
             'image-build': {
                     'format': [('docker', 'tar.xz')]
@@ -265,9 +265,13 @@ image_build = {
                     'kickstart': "fedora-docker-base.ks",
                     'distro': 'Fedora-20',
                     'disk_size': 3,
-                    'arches': ['x86_64', 'i386']
+                    'arches': ['x86_64', 'i386'],
+                    'repo_from': 'Cloud'
+                    'install_tree_from': 'Cloud'
                     }
-        },
+        }
+        ],
+    '^Cloud_Images$': [
         {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
@@ -278,7 +282,9 @@ image_build = {
                     'kickstart': "fedora-cloud-base.ks",
                     'distro': 'Fedora-20',
                     'disk_size': 3,
-                    'arches': ['x86_64', 'i386']
+                    'arches': ['x86_64', 'i386'],
+                    'repo_from': 'Cloud'
+                    'install_tree_from': 'Cloud'
                      }
         },
         {
@@ -291,7 +297,9 @@ image_build = {
                     'kickstart': "fedora-cloud-base-vagrant.ks",
                     'distro': 'Fedora-20',
                     'disk_size': 40,
-                    'arches': ['x86_64', 'i386']
+                    'arches': ['x86_64', 'i386'],
+                    'repo_from': 'Cloud'
+                    'install_tree_from': 'Cloud'
                      }
         }
         ],
@@ -312,7 +320,7 @@ live_media = {
                 'repo_from': 'Everything'
             }
         ],
-    '^Live$': [
+    '^Spins': [
             {
                 'name': 'Fedora-Live-KDE',
                 'target': 'f24',
@@ -386,7 +394,7 @@ live_media = {
                 'install_tree_from': 'Everything'
             }
         ],
-    '^Spins$': [
+    '^Labs$': [
             {
                 'name': 'Fedora-Live-Astronomy_KDE',
                 'target': 'f24',
@@ -490,6 +498,7 @@ live_images = [
     ('^Workstation$', {
         "armhfp": {
                 'kickstart': "fedora-arm-workstation.ks",
+                "name": "Fedora-Workstation-armhfp",
                 "version": "Rawhide",
                 "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
                 "type": "appliance"
@@ -498,11 +507,56 @@ live_images = [
     ('^Server$', {
         "armhfp": {
                 'kickstart': "fedora-arm-server.ks",
+                "name": "Fedora-Server-armhfp",
                 "version": "Rawhide",
                 "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
                 "type": "appliance"
                 }
     }),
+    ('^Spins$', {
+        "armhfp": {
+                'kickstart': "fedora-arm-kde.ks",
+                "name": "Fedora-KDE-armhfp",
+                "version": "Rawhide",
+                "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
+                "type": "appliance"
+                },
+                {
+                'kickstart': "fedora-arm-lxde.ks",
+                "name": "Fedora-LXDE-armhfp",
+                "version": "Rawhide",
+                "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
+                "type": "appliance"
+                },
+                {
+                'kickstart': "fedora-arm-mate.ks",
+                "name": "Fedora-Mate-armhfp",
+                "version": "Rawhide",
+                "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
+                "type": "appliance"
+                },
+                {
+                'kickstart': "fedora-arm-minimal.ks",
+                "name": "Fedora-Minimal-armhfp",
+                "version": "Rawhide",
+                "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
+                "type": "appliance"
+                },
+                {
+                'kickstart': "fedora-arm-soas.ks",
+                "name": "Fedora-SoaS-armhfp",
+                "version": "Rawhide",
+                "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
+                "type": "appliance"
+                },
+                {
+                'kickstart': "fedora-arm-xfce.ks",
+                "name": "Fedora-Xfce-armhfp",
+                "version": "Rawhide",
+                "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
+                "type": "appliance"
+                },
+    }),
 ]
 
 release_id_allow_missing = True