From 3231f80b73c49367da8a95488033fa1f68976273 Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: Sep 25 2019 19:50:45 +0000
Subject: Add an empty variant for cloud, and tweak the cloud image a little bit


---

diff --git a/images.conf b/images.conf
index e82b65e..74dfe84 100644
--- a/images.conf
+++ b/images.conf
@@ -14,6 +14,7 @@ sigkeys = ['8483C65D']
 hashed_directories = False
 
 tree_arches = ['i386', 'x86_64']
+tree_variants = ['Cloud']
 
 # PKGSET
 pkgset_source = "koji"
@@ -65,7 +66,7 @@ createiso_skip = [
 ]
 
 image_build = {
-    "^BaseOS$": [
+    "^Cloud$": [
         { 
             "image-build": {
                 "format": [("qcow2", "qcow2")],
@@ -81,7 +82,7 @@ image_build = {
                 "repo": [
 		     'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', 
 		     'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'],
-		"install_tree_from": 'http://mirror.centos.org/8.0.1905/BaseOS/$arch/kickstart',
+		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart',
                 "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
@@ -103,7 +104,7 @@ image_build = {
                 "repo": [
 		     'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', 
 		     'http://mirror.centos.org/centos/8.0.1905/AppStream/$arch/kickstart'],
-		"install_tree_from": 'http://mirror.centos.org/8.0.1905/BaseOS/$arch/kickstart',
+		"install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart',
                 "failable": ["ppc64le","aarch64"],
             },
             "factory-parameters": {
@@ -112,3 +113,8 @@ image_build = {
         }
     ]
 }
+
+translate_paths = [
+	("/mnt/koji", "https://koji.mbox.centos.org/pkgs"),
+	("/compose", "http://172.22.0.123/compose"),
+]
diff --git a/variants.xml b/variants.xml
index 8c3a90b..bb371a1 100644
--- a/variants.xml
+++ b/variants.xml
@@ -217,5 +217,11 @@
       -->
     </modules>
   </variant>
-
+  <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
+    <arches>
+      <arch>aarch64</arch>
+      <arch>x86_64</arch>
+      <arch>ppc64le</arch>
+    </arches>
+  </variant>
 </variants>