From b00e860556eeaa49aa5231a229e52703246a373b Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 14:16:51 +0100 Subject: [PATCH] Setup for rawhide being F34 Signed-off-by: Tomas Hrcka --- fedora.conf | 18 +++++++++--------- nightly.sh | 2 +- variants-fedora.xml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fedora.conf b/fedora.conf index ad15877..c10bd43 100644 --- a/fedora.conf +++ b/fedora.conf @@ -34,7 +34,7 @@ hashed_directories = True # RUNROOT settings runroot_method = 'koji' runroot_channel = 'compose' -runroot_tag = 'f34-build' +runroot_tag = 'f35-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -44,7 +44,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f34' +pkgset_koji_tag = 'f35' pkgset_koji_inherit = False filter_system_release_packages = False @@ -306,7 +306,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 = 'f34' +global_target = 'f35' image_build = { '^Container$': [ @@ -326,7 +326,7 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]', + 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}', }, }, @@ -346,7 +346,7 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]', + 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}', }, } @@ -689,7 +689,7 @@ failable_deliverables = [ }) ] -live_target = 'f34' +live_target = 'f35' live_images_no_rename = True # fomat: [(variant_uid_regex, {arch|*: scm_dict})] live_images = [ @@ -811,7 +811,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-34-primary", + "ostree_oskey=fedora-35-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", @@ -837,7 +837,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-34-primary", + "ostree_oskey=fedora-35-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", @@ -863,7 +863,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-34-primary", + "ostree_oskey=fedora-35-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/silverblue", "ostree_update_ref=fedora/rawhide/aarch64/silverblue", diff --git a/nightly.sh b/nightly.sh index 03160a9..aba3576 100755 --- a/nightly.sh +++ b/nightly.sh @@ -213,7 +213,7 @@ umask $old_umask # Push rawhide base container image to fedora registry pushd ./releng pushd ./scripts -./sync-latest-container-base-image.sh 34 +./sync-latest-container-base-image.sh 35 popd popd diff --git a/variants-fedora.xml b/variants-fedora.xml index d6a92ed..433ff39 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -95,7 +95,7 @@ x86_64 - f34-modular + f35-modular