From d08f09f405edf3e8cabc6b39d6ef6fc2178fe764 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 8 Feb 2022 15:24:48 -0800
Subject: [PATCH] Adjust for fedora-37 key and update fedora-cloud to f37

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 fedora-cloud.conf     | 36 ++++++++++++++++++------------------
 fedora-container.conf |  2 +-
 fedora.conf           |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/fedora-cloud.conf b/fedora-cloud.conf
index da42b7c..4826c1b 100644
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora-Cloud'
 release_short = 'Fedora-Cloud'
-release_version = '35'
+release_version = '37'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@@ -10,11 +10,11 @@ comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': 'main',
-    'file': 'comps-f35.xml',
-    'command': 'make comps-f35.xml'
+    'file': 'comps-f37.xml',
+    'command': 'make comps-f37.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['429476B4'] # None = unsigned
+sigkeys = ['5323552A'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
@@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f35-build'
+runroot_tag = 'f37-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f35-updates'
+pkgset_koji_tag = 'f37-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@@ -218,19 +218,19 @@ image_build = {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                     'name': 'Fedora-Cloud-Base',
-                    'target': 'f35',
-                    'version': '35',
+                    'target': 'f37',
+                    'version': '37',
                     'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37',
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
                     'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' 
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/' 
                     ],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/',
                     'subvariant': 'Cloud_Base'
                      }
         },
@@ -238,19 +238,19 @@ image_build = {
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Cloud-Base-Vagrant',
-                    'target': 'f35',
-                    'version': '35',
+                    'target': 'f37',
+                    'version': '37',
                     'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37',
                     'kickstart': 'fedora-cloud-base-vagrant.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
                     'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' 
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/' 
                     ],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/',
                     'subvariant': 'Cloud_Base',
                      }
         },
diff --git a/fedora-container.conf b/fedora-container.conf
index 51bf8f0..e237f75 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -14,7 +14,7 @@ comps_file = {
     'command': 'make comps-f35.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['429476B4'] # None = unsigned
+sigkeys = ['5323552A'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
diff --git a/fedora.conf b/fedora.conf
index eee6ca1..7d66aba 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -25,7 +25,7 @@ module_obsoletes_dir = {
 }
 
 variants_file='variants-fedora.xml'
-sigkeys = ['38AB71F4']
+sigkeys = ['5323552A']
 
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included