From 3fd7bc29d631299be4810526e4c37c6493760fa1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 25 2016 00:37:37 +0000
Subject: ppc: add docker and qemu cloud images to nightly compose


---

diff --git a/fedora-ppc.conf b/fedora-ppc.conf
index 8d29758..b7b1745 100644
--- a/fedora-ppc.conf
+++ b/fedora-ppc.conf
@@ -24,7 +24,7 @@ tree_arches = ['ppc64', 'ppc64le']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
 #tree_variants = ['Server']
-tree_variants = ["Everything", "Server"]
+tree_variants = ["Everything", "Server", "Cloud", "CloudImages", "Docker"]
 
 hashed_directories = True
 
@@ -267,7 +267,7 @@ disc_types = {
 }
 
 translate_paths = [
-   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+   ('/mnt/koji/compose/', 'http://ppcpkgs.fedoraproject.org/compose/'),
 ]
 
 
@@ -282,14 +282,17 @@ image_build = {
                     'release': None,
                     # correct SHA1 hash will be put into the URL below automatically
                     'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
-                    'kickstart': 'fedora-docker-base.ks',
-                    'distro': 'Fedora-20',
+                    'kickstart': 'fedora-docker-base-ppc.ks',
+                    'distro': 'Fedora-22',
                     'disk_size': 3,
-                    'arches': ['x86_64'],
+                    'arches': ['ppc64','ppc64le'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Docker_Base'
                     }
+            'factory-parameters': {
+                    'generate_icicle': 'false'
+                    }
         }
         ],
     '^CloudImages$': [
@@ -301,14 +304,17 @@ image_build = {
                     'version': '24',
                     'release': None,
                     'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
-                    'kickstart': 'fedora-cloud-base.ks',
-                    'distro': 'Fedora-20',
+                    'kickstart': 'fedora-cloud-base-ppc.ks',
+                    'distro': 'Fedora-22',
                     'disk_size': 3,
-                    'arches': ['x86_64', 'i386'],
+                    'arches': ['ppc64', 'ppc64le'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base'
                      }
+            'factory-parameters': {
+                    'offline_icicle': 'false'
+                    }
         },
         {
             'image-build': {
@@ -319,7 +325,7 @@ image_build = {
                     'release': None,
                     'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
                     'kickstart': 'fedora-cloud-base-vagrant.ks',
-                    'distro': 'Fedora-20',
+                    'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64', 'i386'],
                     'repo_from': 'Cloud',
diff --git a/nightly.sh b/nightly.sh
index 28077c3..510f880 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -89,7 +89,7 @@ compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID
 }
 
 
-for dir in Everything Server ;
+for dir in Everything Server Cloud CloudImages Docker;
   do
     $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /mnt/koji/tree/development/$DIST/$dir/ --link-dest=/mnt/koji/tree/development/$DIST/Everything/ --exclude=repodata ;
     $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /mnt/koji/tree/development/$DIST/$dir/ --link-dest=/mnt/koji/tree/development/$DIST/Everything/ --delete-after ;
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 75e2ebd..a645e38 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -13,6 +13,9 @@
     <variant id="Docker" name="Docker" type="variant" is_empty="true">
         <arches>
             <arch>x86_64</arch>
+            <arch>aarch64</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
         </arches>
     </variant>
     <variant id="Everything" name="Everything" type="variant">
@@ -260,6 +263,9 @@
         <arches>
             <arch>i386</arch>
             <arch>x86_64</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>aarch64</arch>
         </arches>
     </variant>
     <variant id="Server" name="Server" type="variant">