From 9f4edbea832fe3c90e03aecfd373065a71c7da59 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: May 02 2021 17:39:50 +0000
Subject: rawhide: fix container.conf also


Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/fedora-container.conf b/fedora-container.conf
index 3ef70f3..056280e 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora-Container'
 release_short = 'Fedora-Container'
-release_version = '29'
+release_version = '35'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@@ -10,8 +10,8 @@ comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': 'master',
-    'file': 'comps-f29.xml',
-    'command': 'make comps-f29.xml'
+    'file': 'comps-f35.xml',
+    'command': 'make comps-f35.xml'
 }
 variants_file='variants-fedora.xml'
 sigkeys = ['429476B4'] # None = unsigned
@@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f29-build'
+runroot_tag = 'f35-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f29-updates'
+pkgset_koji_tag = 'f35-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@@ -213,10 +213,10 @@ translate_paths = [
 ]
 
 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = '29'
-global_target = 'f29'
+global_version = '35'
+global_target = 'f35'
 
 image_build = {
     '^Container$': [
@@ -228,18 +228,18 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 5,
                     'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
                     'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
+                        '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/'
                     ],
                     'subvariant': 'Container_Base'
                     },
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
+                'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
             },
         },
         {
@@ -250,18 +250,18 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 5,
                     'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
                     'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
+                        '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/'
                     ],
                     'subvariant': 'Container_Minimal_Base',
                     },
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
+                'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
             },
         }
         ],