diff --git a/fedora.conf b/fedora.conf index dbd0757..c374b8f 100644 --- a/fedora.conf +++ b/fedora.conf @@ -19,7 +19,7 @@ module_defaults_dir = { } variants_file='variants-fedora.xml' -sigkeys = ['9570FF31'] +sigkeys = ['45719A39', '9570FF31'] # limit tree architectures # if undefined, all architectures from variants.xml will be included @@ -34,7 +34,7 @@ hashed_directories = True # RUNROOT settings runroot_method = 'koji' runroot_channel = 'compose' -runroot_tag = 'f33-build' +runroot_tag = 'f34-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -44,7 +44,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f33' +pkgset_koji_tag = 'f34' pkgset_koji_inherit = False filter_system_release_packages = False @@ -294,7 +294,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 = 'f33' +global_target = 'f34' image_build = { '^Container$': [ @@ -314,8 +314,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}', + 'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}', }, }, { @@ -334,8 +334,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}', + 'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}', }, } ], @@ -646,7 +646,7 @@ failable_deliverables = [ }) ] -live_target = 'f33' +live_target = 'f34' live_images_no_rename = True # fomat: [(variant_uid_regex, {arch|*: scm_dict})] live_images = [ @@ -766,7 +766,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-33-primary", + "ostree_oskey=fedora-34-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", @@ -792,7 +792,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-33-primary", + "ostree_oskey=fedora-34-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", @@ -818,7 +818,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-33-primary", + "ostree_oskey=fedora-34-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 eeb1a94..3d1b9fc 100755 --- a/nightly.sh +++ b/nightly.sh @@ -204,7 +204,7 @@ umask $old_umask # Push rawhide base container image to fedora registry pushd ./releng pushd ./scripts -./sync-latest-container-base-image.sh 33 +./sync-latest-container-base-image.sh 34 popd popd diff --git a/variants-fedora.xml b/variants-fedora.xml index 80fee55..d6a92ed 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -95,7 +95,7 @@ x86_64 - f33-modular + f34-modular