From 547c2b66aba451918643dd7a7ac11764ce49911c Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Aug 13 2019 07:37:39 +0000 Subject: f32 becomes rawhide Signed-off-by: Tomas Hrcka --- diff --git a/fedora.conf b/fedora.conf index f498770..981ea7e 100644 --- a/fedora.conf +++ b/fedora.conf @@ -36,7 +36,7 @@ hashed_directories = True # RUNROOT settings runroot = True runroot_channel = 'compose' -runroot_tag = 'f31-build' +runroot_tag = 'f32-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -46,7 +46,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f31' +pkgset_koji_tag = 'f32' pkgset_koji_inherit = False filter_system_release_packages = False @@ -295,7 +295,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 = 'f31' +global_target = 'f32' image_build = { '^Container$': [ @@ -315,8 +315,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f31container", "FGC=f31", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}', + 'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}', }, }, { @@ -335,8 +335,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f31container", "FGC=f31", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}', + 'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}', }, } ], @@ -623,7 +623,7 @@ failable_deliverables = [ }) ] -live_target = 'f31' +live_target = 'f32' live_images_no_rename = True # fomat: [(variant_uid_regex, {arch|*: scm_dict})] live_images = [ @@ -741,7 +741,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-31-primary", + "ostree_oskey=fedora-32-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", @@ -760,7 +760,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-31-primary", + "ostree_oskey=fedora-32-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist", "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", @@ -779,7 +779,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-31-primary", + "ostree_oskey=fedora-32-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/variants-fedora.xml b/variants-fedora.xml index 928ef12..22cdf6c 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -95,7 +95,7 @@ x86_64 - f31-modular + f32-modular