Merge #319 Rawhide mass branching changes

This commit is contained in:
Dennis Gilmore 2017-08-15 17:38:42 +00:00
commit e650328505

View File

@ -14,7 +14,7 @@ comps_file = 'comps-rawhide.xml' #{
#} #}
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['F5282EE4'] sigkeys = ['9DB62FB1']
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # if undefined, all architectures from variants.xml will be included
@ -29,7 +29,7 @@ hashed_directories = True
# RUNROOT settings # RUNROOT settings
runroot = True runroot = True
runroot_channel = 'compose' runroot_channel = 'compose'
runroot_tag = 'f27-build' runroot_tag = 'f28-build'
# PKGSET # PKGSET
pkgset_source = 'koji' # koji, repos pkgset_source = 'koji' # koji, repos
@ -39,7 +39,7 @@ pkgset_source = 'koji' # koji, repos
# pkgset_repos = {} # pkgset_repos = {}
# PKGSET - KOJI # PKGSET - KOJI
pkgset_koji_tag = 'f27' pkgset_koji_tag = 'f28'
pkgset_koji_inherit = False pkgset_koji_inherit = False
filter_system_release_packages = False filter_system_release_packages = False
@ -272,7 +272,7 @@ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = 'Rawhide' global_version = 'Rawhide'
# live_images ignores this in favor of live_target # live_images ignores this in favor of live_target
global_target = 'f27' global_target = 'f28'
image_build = { image_build = {
'^Docker$': [ '^Docker$': [
@ -622,7 +622,7 @@ failable_deliverables = [
}) })
] ]
live_target = 'f27' live_target = 'f28'
live_images_no_rename = True live_images_no_rename = True
# fomat: [(variant_uid_regex, {arch|*: scm_dict})] # fomat: [(variant_uid_regex, {arch|*: scm_dict})]
live_images = [ live_images = [