davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #261 rawhide: updates/cleanup for atomic pungi configs

Browse Source
This commit is contained in:
Mohan Boddu 2017-07-01 17:51:01 +00:00
commit ea9a7ad4c9
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fedora-atomic.conf
View File

@ -23,7 +23,7 @@ comps_file = 'comps-f26.xml' #{
# 'file': 'comps-f23.xml', # 'file': 'comps-f23.xml',
#} #}
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned sigkeys = ['64DAB85D'] # None = unsigned
# 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
tree_arches = ['x86_64'] tree_arches = ['x86_64']
@ -226,10 +226,6 @@ image_build = {
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 6, 'disk_size': 6,
'arches': ['x86_64'], 'arches': ['x86_64'],
'repo_from': 'Cloud',
'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
],
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic' 'subvariant': 'Atomic'
} }
@ -246,10 +242,6 @@ image_build = {
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
'repo_from': 'Cloud',
'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
],
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic' 'subvariant': 'Atomic'
}, },
@ -262,8 +254,8 @@ image_build = {
ostree_installer = [ ostree_installer = [
("^Atomic$", { ("^Atomic$", {
"x86_64": { "x86_64": {
"source_repo_from": [ "Cloud", "repo": [ "Cloud",
"https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"], "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
"release": None, "release": None,
"installpkgs": ["fedora-productimg-atomic"], "installpkgs": ["fedora-productimg-atomic"],
"rootfs_size": "3", "rootfs_size": "3",

2
fedora.conf
View File

@ -359,7 +359,6 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 6, 'disk_size': 6,
'arches': ['aarch64', 'ppc64le', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 'x86_64'],
'repo': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic', 'subvariant': 'Atomic',
'failable': ['*'], 'failable': ['*'],
@ -373,7 +372,6 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
'repo': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic', 'subvariant': 'Atomic',
'failable': ['*'], 'failable': ['*'],