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

disable 32 bit x86 cloud images, and add the atmoic versions

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-04-11 14:10:27 -05:00
parent a51725821e
commit 4b65a9251e
1 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
fedora.conf
View File

@ -306,7 +306,7 @@ image_build = {
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64', 'i386'],
'arches': ['x86_64'],
'repo_from': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base'
@ -323,7 +323,41 @@ image_build = {
'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
'arches': ['x86_64', 'i386'],
'arches': ['x86_64'],
'repo_from': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base'
}
},
{
'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Atomic',
'target': 'f25',
'version': 'Rawhide',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': 'fedora-atomic.ks',
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64'],
'repo_from': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base'
}
},
{
'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Atomic-Vagrant',
'target': 'f25',
'version': 'Rawhide',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': 'fedora-atomic-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
'arches': ['x86_64'],
'repo_from': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base'
@ -569,27 +603,27 @@ ostree = [
})
]
#ostree_installer = [
# ("^Atomic$", {
# "x86_64": {
# "source_repo_from": "Everything",
# "release": None,
# "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
# "installpkgs": ["fedora-productimg-atomic"],
# "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
# "add_template_var": [
# "ostree_osname=fedora-atomic",
# "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
# ],
# "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
# "add_arch_template_var": [
# "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
# "ostree_osname=fedora-atomic",
# "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
# ]
# }
# })
#]
ostree_installer = [
("^Atomic$", {
"x86_64": {
"source_repo_from": "Everything",
"release": None,
"filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
"add_template_var": [
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
],
"add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
"add_arch_template_var": [
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
]
}
})
]
release_id_allow_missing = True
koji_profile = 'koji'