From ce98ad932508f93a1b0984b8a10f1666d5f296b1 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Aug 14 2018 20:37:05 +0000 Subject: Rawhide being F30 Signed-off-by: Mohan Boddu --- diff --git a/fedora.conf b/fedora.conf index 35cd126..71e6a4b 100644 --- a/fedora.conf +++ b/fedora.conf @@ -21,7 +21,7 @@ module_defaults_dir = { } variants_file='variants-fedora.xml' -sigkeys = ['429476B4'] +sigkeys = ['CFC659B9', '429476B4'] # limit tree architectures # if undefined, all architectures from variants.xml will be included @@ -36,7 +36,7 @@ hashed_directories = True # RUNROOT settings runroot = True runroot_channel = 'compose' -runroot_tag = 'f29-build' +runroot_tag = 'f30-build' ## PDC settings pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1' @@ -52,7 +52,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f29' +pkgset_koji_tag = 'f30' pkgset_koji_inherit = False filter_system_release_packages = False @@ -296,7 +296,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 = 'f29' +global_target = 'f30' image_build = { '^Container$': [ @@ -316,8 +316,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', + 'docker_env': '[ "DISTTAG=f30container", "FGC=f30" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}', }, }, { @@ -336,8 +336,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', + 'docker_env': '[ "DISTTAG=f30container", "FGC=f30" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}', }, } ], @@ -656,7 +656,7 @@ failable_deliverables = [ }) ] -live_target = 'f29' +live_target = 'f30' live_images_no_rename = True # fomat: [(variant_uid_regex, {arch|*: scm_dict})] live_images = [