From c67c1c74fd913e7d4b6d915391dd950b84c7c9bf Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 14:21:48 +0200 Subject: [PATCH] Rawhide is now Fedora 38 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 ea66423..1e4f6d3 100644 --- a/fedora.conf +++ b/fedora.conf @@ -40,7 +40,7 @@ hashed_directories = True # RUNROOT settings runroot_method = 'koji' runroot_channel = 'compose' -runroot_tag = 'f37-build' +runroot_tag = 'f38-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -50,7 +50,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f37' +pkgset_koji_tag = 'f38' pkgset_koji_inherit = False filter_system_release_packages = False @@ -368,7 +368,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 = 'f37' +global_target = 'f38' image_build = { '^Container$': [ @@ -388,8 +388,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}', + 'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}', }, }, { @@ -408,8 +408,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}', + 'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}', }, } ], @@ -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-37-primary", + "ostree_oskey=fedora-38-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", @@ -856,7 +856,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-37-primary", + "ostree_oskey=fedora-38-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", @@ -882,7 +882,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-37-primary", + "ostree_oskey=fedora-38-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/silverblue", "ostree_update_ref=fedora/rawhide/aarch64/silverblue", @@ -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-37-primary", + "ostree_oskey=fedora-38-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", @@ -937,7 +937,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-37-primary", + "ostree_oskey=fedora-38-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/kinoite", "ostree_update_ref=fedora/rawhide/ppc64le/kinoite", @@ -963,7 +963,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-37-primary", + "ostree_oskey=fedora-38-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 3c76b9c..3034e4b 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 37 +./sync-latest-container-base-image.sh 38 popd popd diff --git a/variants-fedora.xml b/variants-fedora.xml index ef841e2..45b35be 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -102,7 +102,7 @@ x86_64 - f37-modular + f38-modular