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

fix up failable deliverables, get the right git branches

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-08-15 10:21:05 -05:00
parent 88fa4e95b2
commit 716f612efd
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fedora.conf
View File

@ -384,6 +384,7 @@ live_media = {
'name': 'Fedora-Xfce-Live', 'name': 'Fedora-Xfce-Live',
'kickstart': 'fedora-live-xfce.ks', 'kickstart': 'fedora-live-xfce.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Xfce' 'subvariant': 'Xfce'
@ -392,6 +393,7 @@ live_media = {
'name': 'Fedora-SoaS-Live', 'name': 'Fedora-SoaS-Live',
'kickstart': 'fedora-live-soas.ks', 'kickstart': 'fedora-live-soas.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'SoaS' 'subvariant': 'SoaS'
@ -400,6 +402,7 @@ live_media = {
'name': 'Fedora-Cinnamon-Live', 'name': 'Fedora-Cinnamon-Live',
'kickstart': 'fedora-live-cinnamon.ks', 'kickstart': 'fedora-live-cinnamon.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Cinnamon' 'subvariant': 'Cinnamon'
@ -408,6 +411,7 @@ live_media = {
'name': 'Fedora-LXDE-Live', 'name': 'Fedora-LXDE-Live',
'kickstart': 'fedora-live-lxde.ks', 'kickstart': 'fedora-live-lxde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'LXDE' 'subvariant': 'LXDE'
@ -416,6 +420,7 @@ live_media = {
'name': 'Fedora-MATE_Compiz-Live', 'name': 'Fedora-MATE_Compiz-Live',
'kickstart': 'fedora-live-mate_compiz.ks', 'kickstart': 'fedora-live-mate_compiz.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Mate' 'subvariant': 'Mate'
@ -426,6 +431,7 @@ live_media = {
'name': 'Fedora-Astronomy_KDE-Live', 'name': 'Fedora-Astronomy_KDE-Live',
'kickstart': 'fedora-live-astronomy_kde.ks', 'kickstart': 'fedora-live-astronomy_kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Astronomy_KDE' 'subvariant': 'Astronomy_KDE'
@ -434,6 +440,7 @@ live_media = {
'name': 'Fedora-Design_suite-Live', 'name': 'Fedora-Design_suite-Live',
'kickstart': 'fedora-live-design_suite.ks', 'kickstart': 'fedora-live-design_suite.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Design_suite' 'subvariant': 'Design_suite'
@ -442,6 +449,7 @@ live_media = {
'name': 'Fedora-Scientific_KDE-Live', 'name': 'Fedora-Scientific_KDE-Live',
'kickstart': 'fedora-live-scientific_kde.ks', 'kickstart': 'fedora-live-scientific_kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Scientific_KDE' 'subvariant': 'Scientific_KDE'
@ -450,6 +458,7 @@ live_media = {
'name': 'Fedora-Games-Live', 'name': 'Fedora-Games-Live',
'kickstart': 'fedora-live-games.ks', 'kickstart': 'fedora-live-games.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Games' 'subvariant': 'Games'
@ -458,6 +467,7 @@ live_media = {
'name': 'Fedora-Security-Live', 'name': 'Fedora-Security-Live',
'kickstart': 'fedora-live-security.ks', 'kickstart': 'fedora-live-security.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Security' 'subvariant': 'Security'
@ -466,6 +476,7 @@ live_media = {
'name': 'Fedora-Jam_KDE-Live', 'name': 'Fedora-Jam_KDE-Live',
'kickstart': 'fedora-live-jam_kde.ks', 'kickstart': 'fedora-live-jam_kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Jam_KDE' 'subvariant': 'Jam_KDE'
@ -474,6 +485,7 @@ live_media = {
'name': 'Fedora-Robotics-Live', 'name': 'Fedora-Robotics-Live',
'kickstart': 'fedora-live-robotics.ks', 'kickstart': 'fedora-live-robotics.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Robotics' 'subvariant': 'Robotics'
@ -499,14 +511,16 @@ live_images = [
'armhfp': { 'armhfp': {
'kickstart': 'fedora-arm-workstation.ks', 'kickstart': 'fedora-arm-workstation.ks',
'name': 'Fedora-Workstation-armhfp', 'name': 'Fedora-Workstation-armhfp',
'type': 'appliance' 'type': 'appliance',
'failable': True,
} }
}), }),
('^Server$', { ('^Server$', {
'armhfp': { 'armhfp': {
'kickstart': 'fedora-arm-server.ks', 'kickstart': 'fedora-arm-server.ks',
'name': 'Fedora-Server-armhfp', 'name': 'Fedora-Server-armhfp',
'type': 'appliance' 'type': 'appliance',
'failable': True,
} }
}), }),
('^Spins$', { ('^Spins$', {
@ -515,42 +529,48 @@ live_images = [
'name': 'Fedora-KDE-armhfp', 'name': 'Fedora-KDE-armhfp',
'repo_from': 'Everything', 'repo_from': 'Everything',
'type': 'appliance', 'type': 'appliance',
'subvariant': 'KDE' 'subvariant': 'KDE',
'failable': True,
}, },
{ {
'kickstart': 'fedora-arm-lxde.ks', 'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp', 'name': 'Fedora-LXDE-armhfp',
'repo_from': 'Everything', 'repo_from': 'Everything',
'type': 'appliance', 'type': 'appliance',
'subvariant': 'LXDE' 'subvariant': 'LXDE',
'failable': True,
}, },
{ {
'kickstart': 'fedora-arm-mate.ks', 'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp', 'name': 'Fedora-Mate-armhfp',
'repo_from': 'Everything', 'repo_from': 'Everything',
'type': 'appliance', 'type': 'appliance',
'subvariant': 'Mate' 'subvariant': 'Mate',
'failable': True,
}, },
{ {
'kickstart': 'fedora-arm-minimal.ks', 'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp', 'name': 'Fedora-Minimal-armhfp',
'repo_from': 'Everything', 'repo_from': 'Everything',
'type': 'appliance', 'type': 'appliance',
'subvariant': 'Minimal' 'subvariant': 'Minimal',
'failable': False,
}, },
{ {
'kickstart': 'fedora-arm-soas.ks', 'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp', 'name': 'Fedora-SoaS-armhfp',
'repo_from': 'Everything', 'repo_from': 'Everything',
'type': 'appliance', 'type': 'appliance',
'subvariant': 'SoaS' 'subvariant': 'SoaS',
'failable': True,
}, },
{ {
'kickstart': 'fedora-arm-xfce.ks', 'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp', 'name': 'Fedora-Xfce-armhfp',
'repo_from': 'Everything', 'repo_from': 'Everything',
'type': 'appliance', 'type': 'appliance',
'subvariant': 'Xfce' 'subvariant': 'Xfce',
'failable': True,
},] },]
}), }),
] ]
@ -559,17 +579,21 @@ ostree = [
("^Atomic$", { ("^Atomic$", {
"x86_64": { "x86_64": {
"treefile": "fedora-atomic-docker-host.json", "treefile": "fedora-atomic-docker-host.json",
"config_url": "https://pagure.io/fedora-atomic.git", "config_url": "https://ipagure.io/fedora-atomic.git",
"config_branch": "f25",
"source_repo_from": "Everything", "source_repo_from": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/25/" "ostree_repo": "/mnt/koji/compose/atomic/25/",
'failable': ['*'],
} }
}), }),
("^ostree$", { ("^ostree$", {
"x86_64": { "x86_64": {
"treefile": "fedora-ostree-workstation.json", "treefile": "fedora-ostree-workstation.json",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f25",
"source_repo_from": "Workstation", "source_repo_from": "Workstation",
"ostree_repo": "/mnt/koji/compose/ostree/25/" "ostree_repo": "/mnt/koji/compose/ostree/25/",
'failable': ['*'],
} }
}) })
] ]
@ -593,7 +617,8 @@ ostree_installer = [
"ostree_ref=fedora-atomic/25/x86_64/docker-host", "ostree_ref=fedora-atomic/25/x86_64/docker-host",
] ]
'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master', 'template_branch': 'f25',
'failable': ['*'],
} }
}), }),
("^Workstation$", { ("^Workstation$", {
@ -614,7 +639,8 @@ ostree_installer = [
"ostree_ref=fedora/25/x86_64/workstation", "ostree_ref=fedora/25/x86_64/workstation",
] ]
'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master', 'template_branch': 'f25',
'failable': ['*'],
} }
}) })
] ]