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

add some missing artifacts and put others in the correct location

Browse Source 
Put Docker image in its own variant, and break out the Cloud_Images
add the missing arm Spins
put the move Spins to Labs and Live to Spins

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-02-18 09:40:14 -06:00
parent 95f30a7136
commit c87901b05a
1 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
fedora.conf
View File

@ -253,7 +253,7 @@ translate_paths = [
image_build = { image_build = {
'^Cloud$': [ '^Docker$': [
{ {
'image-build': { 'image-build': {
'format': [('docker', 'tar.xz')] 'format': [('docker', 'tar.xz')]
@ -265,9 +265,13 @@ image_build = {
'kickstart': "fedora-docker-base.ks", 'kickstart': "fedora-docker-base.ks",
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64', 'i386'] 'arches': ['x86_64', 'i386'],
'repo_from': 'Cloud'
'install_tree_from': 'Cloud'
} }
}, }
],
'^Cloud_Images$': [
{ {
'image-build': { 'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')] 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
@ -278,7 +282,9 @@ image_build = {
'kickstart': "fedora-cloud-base.ks", 'kickstart': "fedora-cloud-base.ks",
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64', 'i386'] 'arches': ['x86_64', 'i386'],
'repo_from': 'Cloud'
'install_tree_from': 'Cloud'
} }
}, },
{ {
@ -291,7 +297,9 @@ image_build = {
'kickstart': "fedora-cloud-base-vagrant.ks", 'kickstart': "fedora-cloud-base-vagrant.ks",
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64', 'i386'] 'arches': ['x86_64', 'i386'],
'repo_from': 'Cloud'
'install_tree_from': 'Cloud'
} }
} }
], ],
@ -312,7 +320,7 @@ live_media = {
'repo_from': 'Everything' 'repo_from': 'Everything'
} }
], ],
'^Live$': [ '^Spins': [
{ {
'name': 'Fedora-Live-KDE', 'name': 'Fedora-Live-KDE',
'target': 'f24', 'target': 'f24',
@ -386,7 +394,7 @@ live_media = {
'install_tree_from': 'Everything' 'install_tree_from': 'Everything'
} }
], ],
'^Spins$': [ '^Labs$': [
{ {
'name': 'Fedora-Live-Astronomy_KDE', 'name': 'Fedora-Live-Astronomy_KDE',
'target': 'f24', 'target': 'f24',
@ -490,6 +498,7 @@ live_images = [
('^Workstation$', { ('^Workstation$', {
"armhfp": { "armhfp": {
'kickstart': "fedora-arm-workstation.ks", 'kickstart': "fedora-arm-workstation.ks",
"name": "Fedora-Workstation-armhfp",
"version": "Rawhide", "version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance" "type": "appliance"
@ -498,11 +507,56 @@ live_images = [
('^Server$', { ('^Server$', {
"armhfp": { "armhfp": {
'kickstart': "fedora-arm-server.ks", 'kickstart': "fedora-arm-server.ks",
"name": "Fedora-Server-armhfp",
"version": "Rawhide", "version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance" "type": "appliance"
} }
}), }),
('^Spins$', {
"armhfp": {
'kickstart': "fedora-arm-kde.ks",
"name": "Fedora-KDE-armhfp",
"version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
},
{
'kickstart': "fedora-arm-lxde.ks",
"name": "Fedora-LXDE-armhfp",
"version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
},
{
'kickstart': "fedora-arm-mate.ks",
"name": "Fedora-Mate-armhfp",
"version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
},
{
'kickstart': "fedora-arm-minimal.ks",
"name": "Fedora-Minimal-armhfp",
"version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
},
{
'kickstart': "fedora-arm-soas.ks",
"name": "Fedora-SoaS-armhfp",
"version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
},
{
'kickstart': "fedora-arm-xfce.ks",
"name": "Fedora-Xfce-armhfp",
"version": "Rawhide",
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
"type": "appliance"
},
}),
] ]
release_id_allow_missing = True release_id_allow_missing = True