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

fix up extra {} in image config, attempt to buld arm workstation

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-02-12 02:02:16 -06:00
parent b307398386
commit c201ee3f20
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fedora.conf
View File

@ -256,7 +256,6 @@ image_build = {
'^Cloud$': [ '^Cloud$': [
{ {
'image-build': { 'image-build': {
{
'format': [('docker', 'tar.xz')] 'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base', 'name': 'Fedora-Docker-Base',
'target': 'f24', 'target': 'f24',
@ -267,12 +266,10 @@ image_build = {
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64', 'i386'] 'arches': ['x86_64', 'i386']
} }
}
}, },
{ {
'image-build': { 'image-build': {
{
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')] 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Cloud-Base', 'name': 'Fedora-Cloud-Base',
'target': 'f24', 'target': 'f24',
@ -282,12 +279,10 @@ image_build = {
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64', 'i386'] 'arches': ['x86_64', 'i386']
} }
}
}, },
{ {
'image-build': { 'image-build': {
{
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant', 'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f24', 'target': 'f24',
@ -297,8 +292,7 @@ image_build = {
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64', 'i386'] 'arches': ['x86_64', 'i386']
} }
}
} }
], ],
} }
@ -477,12 +471,18 @@ failable_deliverables = [
}) })
] ]
live_target = 'f24'
# fomat: [(variant_uid_regex, {arch|*: scm_dict})] # fomat: [(variant_uid_regex, {arch|*: scm_dict})]
#live_images = [ live_images = [
# ('^Workstation$', { ('^Workstation$', {
# "x86_64": "fedora-live-workstation.ks", "armhfp": {
# }), 'kickstart': "fedora-live-workstation.ks",
#] "version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
}
}),
]
release_id_allow_missing = True release_id_allow_missing = True
koji_profile = "koji" koji_profile = "koji"