From b6ce6740304ca4dfdeb71b865124f31bd7a2c2a2 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 8 Feb 2022 13:00:25 +0100 Subject: [PATCH] F37 is now rawhide Signed-off-by: Tomas Hrcka --- fedora.conf | 26 +++++++++++++------------- nightly.sh | 2 +- variants-fedora.xml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fedora.conf b/fedora.conf index f59c303..eee6ca1 100644 --- a/fedora.conf +++ b/fedora.conf @@ -40,7 +40,7 @@ hashed_directories = True # RUNROOT settings runroot_method = 'koji' runroot_channel = 'compose' -runroot_tag = 'f36-build' +runroot_tag = 'f37-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -50,7 +50,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f36' +pkgset_koji_tag = 'f37' pkgset_koji_inherit = False filter_system_release_packages = False @@ -316,7 +316,7 @@ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = 'Rawhide' # live_images ignores this in favor of live_target -global_target = 'f36' +global_target = 'f37' image_build = { '^Container$': [ @@ -336,8 +336,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f36container", "FGC=f36", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "36"}', + 'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}', }, }, { @@ -356,8 +356,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f36container", "FGC=f36", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "36"}', + 'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}', }, } ], @@ -778,7 +778,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", "ostree_update_repo=https://ostree.fedoraproject.org", "ostree_osname=fedora", - "ostree_oskey=fedora-36-primary", + "ostree_oskey=fedora-37-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/x86_64/silverblue", "ostree_update_ref=fedora/rawhide/x86_64/silverblue", @@ -804,7 +804,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", "ostree_update_repo=https://ostree.fedoraproject.org", "ostree_osname=fedora", - "ostree_oskey=fedora-36-primary", + "ostree_oskey=fedora-37-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", @@ -830,7 +830,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", "ostree_update_repo=https://ostree.fedoraproject.org", "ostree_osname=fedora", - "ostree_oskey=fedora-36-primary", + "ostree_oskey=fedora-37-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/silverblue", "ostree_update_ref=fedora/rawhide/aarch64/silverblue", @@ -859,7 +859,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", "ostree_update_repo=https://ostree.fedoraproject.org", "ostree_osname=fedora", - "ostree_oskey=fedora-36-primary", + "ostree_oskey=fedora-37-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/x86_64/kinoite", "ostree_update_ref=fedora/rawhide/x86_64/kinoite", @@ -885,7 +885,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", "ostree_update_repo=https://ostree.fedoraproject.org", "ostree_osname=fedora", - "ostree_oskey=fedora-36-primary", + "ostree_oskey=fedora-37-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/kinoite", "ostree_update_ref=fedora/rawhide/ppc64le/kinoite", @@ -911,7 +911,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", "ostree_update_repo=https://ostree.fedoraproject.org", "ostree_osname=fedora", - "ostree_oskey=fedora-36-primary", + "ostree_oskey=fedora-37-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/kinoite", "ostree_update_ref=fedora/rawhide/aarch64/kinoite", diff --git a/nightly.sh b/nightly.sh index 8620612..6f09d4c 100755 --- a/nightly.sh +++ b/nightly.sh @@ -214,7 +214,7 @@ umask $old_umask # Push rawhide base container image to fedora registry pushd ./releng pushd ./scripts -./sync-latest-container-base-image.sh 36 +./sync-latest-container-base-image.sh 37 popd popd diff --git a/variants-fedora.xml b/variants-fedora.xml index ecc1cc8..ef841e2 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -102,7 +102,7 @@ x86_64 - f36-modular + f37-modular