Allow using newer packages
Cloud variant is now enabled as well. It will create repository from a special tag with some newer packages and run lorax on them. This install tree will then be used for building images. The repos still point the the original location outside of compose. The updates repo is used as well. For ostree installer, a runroot tag should be used that includes newer packages as needed. This tag is shared for both ostree installer and buildinstall. Using different tags would require a code change in Pungi. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář
Dennis Gilmore
parent
37c17f0678
commit
860c5a7e73
@ -4,14 +4,24 @@ release_short = 'Fedora-Atomic'
|
||||
release_version = '25'
|
||||
release_is_layered = False
|
||||
# GENERAL SETTINGS
|
||||
bootable = False
|
||||
bootable = True
|
||||
buildinstall_method = 'lorax'
|
||||
lorax_options = [
|
||||
('^.*$', {
|
||||
'x86_64': {
|
||||
'nomacboot': False
|
||||
}
|
||||
'*': {
|
||||
'noupgrade': True
|
||||
}
|
||||
})
|
||||
]
|
||||
comps_file = 'comps-f25.xml' #{
|
||||
# 'scm': 'git',
|
||||
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
|
||||
# 'branch': None, # defaults to cvs/HEAD or git/master
|
||||
# 'file': 'comps-f23.xml',
|
||||
#}
|
||||
keep_original_comps = ['Everything']
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['81B46521', '030D5AED'] # None = unsigned
|
||||
# limit tree architectures
|
||||
@ -19,23 +29,17 @@ sigkeys = ['81B46521', '030D5AED'] # None = unsigned
|
||||
tree_arches = ['i386', 'x86_64', 'armhfp']
|
||||
# limit tree variants
|
||||
# if undefined, all variants from variants.xml will be included
|
||||
tree_variants = ['Atomic', 'CloudImages', 'Docker']
|
||||
tree_variants = ['Atomic', 'Cloud', 'CloudImages', 'Docker']
|
||||
hashed_directories = True
|
||||
# RUNROOT settings
|
||||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f25-build'
|
||||
runroot_tag = 'f25-build-with-newer-ostree' # TODO
|
||||
# PKGSET
|
||||
pkgset_source = 'repos' # koji, repos
|
||||
# PKGSET - REPOS
|
||||
# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
|
||||
pkgset_repos = {'x86_64': ['https://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/x86_64/os/',
|
||||
'https://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/source/tree/'],
|
||||
'i386': ['https://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/i386/os/',
|
||||
'https://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/source/tree/'],
|
||||
'armhfp': ['https://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/x86_64/os/',
|
||||
'https://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/source/tree/']}
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f25-atomic'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
gather_source = 'comps'
|
||||
@ -222,8 +226,11 @@ image_build = {
|
||||
'distro': 'Fedora-20',
|
||||
'disk_size': 3,
|
||||
'arches': ['x86_64', 'armhfp'],
|
||||
'repo': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
|
||||
],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Docker_Base'
|
||||
}
|
||||
}
|
||||
@ -241,8 +248,11 @@ image_build = {
|
||||
'distro': 'Fedora-20',
|
||||
'disk_size': 3,
|
||||
'arches': ['x86_64', 'i386'],
|
||||
'repo': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
|
||||
],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Cloud_Base'
|
||||
}
|
||||
},
|
||||
@ -258,8 +268,11 @@ image_build = {
|
||||
'distro': 'Fedora-20',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
|
||||
],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Cloud_Base',
|
||||
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
|
||||
}
|
||||
@ -276,8 +289,11 @@ image_build = {
|
||||
'distro': 'Fedora-20',
|
||||
'disk_size': 6,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
|
||||
],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic'
|
||||
}
|
||||
},
|
||||
@ -293,8 +309,11 @@ image_build = {
|
||||
'distro': 'Fedora-20',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'repo': [
|
||||
'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
|
||||
'http://download.fedoraproject.org/pub/fedora/linux/updates/25/$basearch/',
|
||||
],
|
||||
'install_tree_from': 'Cloud',
|
||||
'subvariant': 'Atomic'
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user