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

Merge #54 Refactor failability config

Browse Source
This commit is contained in:
Dennis Gilmore 2016-08-11 08:41:19 +00:00
commit f842cc55d6
1 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fedora.conf
View File

@ -291,6 +291,7 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64', 'armhfp'], 'arches': ['x86_64', 'armhfp'],
'failable': ['*'],
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Docker_Base' 'subvariant': 'Docker_Base'
@ -306,6 +307,7 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64'], 'arches': ['x86_64'],
'failable': ['*'],
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base' 'subvariant': 'Cloud_Base'
@ -319,6 +321,7 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
'failable': ['*'],
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base', 'subvariant': 'Cloud_Base',
@ -332,6 +335,7 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 6, 'disk_size': 6,
'arches': ['x86_64'], 'arches': ['x86_64'],
'failable': ['*'],
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic' 'subvariant': 'Atomic'
@ -345,6 +349,7 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
'failable': ['*'],
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic' 'subvariant': 'Atomic'
@ -362,6 +367,7 @@ live_media = {
'name': 'Fedora-Workstation-Live', 'name': 'Fedora-Workstation-Live',
'kickstart': 'fedora-live-workstation.ks', 'kickstart': 'fedora-live-workstation.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', 'i386'],
'failable': ['*'],
'repo_from': 'Everything', 'repo_from': 'Everything',
'subvariant': 'Workstation' 'subvariant': 'Workstation'
@ -372,6 +378,7 @@ live_media = {
'name': 'Fedora-KDE-Live', 'name': 'Fedora-KDE-Live',
'kickstart': 'fedora-live-kde.ks', 'kickstart': 'fedora-live-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': 'KDE' 'subvariant': 'KDE'
@ -381,6 +388,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'
@ -389,6 +397,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'
@ -397,6 +406,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'
@ -405,6 +415,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'
@ -413,6 +424,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'
@ -423,6 +435,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'
@ -431,6 +444,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'
@ -439,6 +453,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'
@ -447,6 +462,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'
@ -455,6 +471,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'
@ -463,6 +480,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'
@ -471,6 +489,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'
@ -481,10 +500,9 @@ live_media = {
failable_deliverables = [ failable_deliverables = [
('^.*$', { ('^.*$', {
# Buildinstall can fail on any variant and any arch # Buildinstall can fail on any variant and any arch
'*': ['image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
'src': ['buildinstall'], 'src': ['buildinstall'],
# Nothing on i386 blocks the compose # Nothing on i386 blocks the compose
'i386': ['buildinstall', 'iso', 'live'], 'i386': ['buildinstall', 'iso'],
}) })
] ]
@ -496,14 +514,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$', {
@ -512,42 +532,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': True,
}, },
{ {
'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,
},] },]
}), }),
] ]
@ -558,7 +584,8 @@ ostree = [
"treefile": "fedora-atomic-docker-host.json", "treefile": "fedora-atomic-docker-host.json",
"config_url": "https://pagure.io/fedora-atomic.git", "config_url": "https://pagure.io/fedora-atomic.git",
"source_repo_from": "Everything", "source_repo_from": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/" "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
'failable': ['*'],
} }
}), }),
("^ostree$", { ("^ostree$", {
@ -566,7 +593,8 @@ ostree = [
"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",
"source_repo_from": "Workstation", "source_repo_from": "Workstation",
"ostree_repo": "/mnt/koji/compose/ostree/rawhide/" "ostree_repo": "/mnt/koji/compose/ostree/rawhide/",
'failable': ['*'],
} }
}) })
] ]
@ -591,6 +619,7 @@ ostree_installer = [
] ]
'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master', 'template_branch': 'master',
'failable': ['*'],
} }
}), }),
("^Workstation$", { ("^Workstation$", {
@ -612,6 +641,7 @@ ostree_installer = [
] ]
'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master', 'template_branch': 'master',
'failable': ['*'],
} }
}) })
] ]