From bb12012fef5b8ec984199e40d76a7521ef5770b0 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Apr 25 2018 15:36:25 +0000
Subject: fedora-atomic: switch to using RC composes as input


This allows us to build on RC content as soon as it is available
rather than waiting for the packages to hit stable.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>

---

diff --git a/fedora-atomic.conf b/fedora-atomic.conf
index aa475ae..4655056 100644
--- a/fedora-atomic.conf
+++ b/fedora-atomic.conf
@@ -271,7 +271,7 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 6,
                     'arches': ['aarch64', 'ppc64le', 'x86_64'],
-                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$arch/os/",
+                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
                     'subvariant': 'AtomicHost',
                      }
         },
@@ -283,7 +283,7 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$arch/os/",
+                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
                     'subvariant': 'AtomicHost',
                      },
             'factory-parameters': {
@@ -299,7 +299,7 @@ ostree = [
             "treefile": "fedora-atomic-host-updates-stable.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "f28",
-            "repo": "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$basearch/os/",
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$basearch/os/",
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             "force_new_commit": True,
@@ -309,7 +309,7 @@ ostree = [
             "treefile": "fedora-atomic-host-updates-stable.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "f28",
-            "repo": "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$basearch/os/",
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$basearch/os/",
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             "force_new_commit": True,
@@ -319,7 +319,7 @@ ostree = [
             "treefile": "fedora-atomic-host-updates-stable.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "f28",
-            "repo": "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$basearch/os/",
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$basearch/os/",
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             "force_new_commit": True,
@@ -329,7 +329,7 @@ ostree = [
 ostree_installer = [
     ("^AtomicHost$", {
         "x86_64": {
-            "repo": "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$arch/os/",
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
             "release": None,
             "rootfs_size": "4",
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -345,7 +345,7 @@ ostree_installer = [
             'template_branch': 'f28',
         },
         "aarch64": {
-            "repo": "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$arch/os/",
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
             "release": None,
             "rootfs_size": "4",
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -361,7 +361,7 @@ ostree_installer = [
             'template_branch': 'f28',
         },
         "ppc64le": {
-            "repo": "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/$arch/os/",
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
             "release": None,
             "rootfs_size": "4",
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",