From ea9a7ad4c991557dc74afcae3054ab3996ff606b Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Jul 01 2017 17:51:01 +0000
Subject: Merge #261 `rawhide: updates/cleanup for atomic pungi configs`


---

diff --git a/fedora-atomic.conf b/fedora-atomic.conf
index 5c0ac0b..c149805 100644
--- a/fedora-atomic.conf
+++ b/fedora-atomic.conf
@@ -23,7 +23,7 @@ comps_file = 'comps-f26.xml' #{
 #    'file': 'comps-f23.xml',
 #}
 variants_file='variants-fedora.xml'
-sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+sigkeys = ['64DAB85D'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['x86_64']
@@ -226,10 +226,6 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 6,
                     'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
-                    'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                    ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
                      }
@@ -246,10 +242,6 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
-                    'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                    ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
                      },
@@ -262,8 +254,8 @@ image_build = {
 ostree_installer = [
     ("^Atomic$", {
         "x86_64": {
-            "source_repo_from": [ "Cloud",
-                                  "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
+            "repo": [ "Cloud",
+                      "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
             "release": None,
             "installpkgs": ["fedora-productimg-atomic"],
             "rootfs_size": "3",
diff --git a/fedora.conf b/fedora.conf
index 6ed84fb..90abd02 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -359,7 +359,6 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 6,
                     'arches': ['aarch64', 'ppc64le', 'x86_64'],
-                    'repo': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic',
                     'failable': ['*'],
@@ -373,7 +372,6 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic',
                     'failable': ['*'],