From 716f612efd6a8e5e3a6d980f382343169bd8047e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 15 Aug 2016 10:21:05 -0500 Subject: [PATCH] fix up failable deliverables, get the right git branches Signed-off-by: Dennis Gilmore --- fedora.conf | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/fedora.conf b/fedora.conf index 1148a5a..d28d3db 100644 --- a/fedora.conf +++ b/fedora.conf @@ -384,6 +384,7 @@ live_media = { 'name': 'Fedora-Xfce-Live', 'kickstart': 'fedora-live-xfce.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Xfce' @@ -392,6 +393,7 @@ live_media = { 'name': 'Fedora-SoaS-Live', 'kickstart': 'fedora-live-soas.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'SoaS' @@ -400,6 +402,7 @@ live_media = { 'name': 'Fedora-Cinnamon-Live', 'kickstart': 'fedora-live-cinnamon.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Cinnamon' @@ -408,6 +411,7 @@ live_media = { 'name': 'Fedora-LXDE-Live', 'kickstart': 'fedora-live-lxde.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'LXDE' @@ -416,6 +420,7 @@ live_media = { 'name': 'Fedora-MATE_Compiz-Live', 'kickstart': 'fedora-live-mate_compiz.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Mate' @@ -426,6 +431,7 @@ live_media = { 'name': 'Fedora-Astronomy_KDE-Live', 'kickstart': 'fedora-live-astronomy_kde.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Astronomy_KDE' @@ -434,6 +440,7 @@ live_media = { 'name': 'Fedora-Design_suite-Live', 'kickstart': 'fedora-live-design_suite.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Design_suite' @@ -442,6 +449,7 @@ live_media = { 'name': 'Fedora-Scientific_KDE-Live', 'kickstart': 'fedora-live-scientific_kde.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Scientific_KDE' @@ -450,6 +458,7 @@ live_media = { 'name': 'Fedora-Games-Live', 'kickstart': 'fedora-live-games.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Games' @@ -458,6 +467,7 @@ live_media = { 'name': 'Fedora-Security-Live', 'kickstart': 'fedora-live-security.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Security' @@ -466,6 +476,7 @@ live_media = { 'name': 'Fedora-Jam_KDE-Live', 'kickstart': 'fedora-live-jam_kde.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Jam_KDE' @@ -474,6 +485,7 @@ live_media = { 'name': 'Fedora-Robotics-Live', 'kickstart': 'fedora-live-robotics.ks', 'arches': ['x86_64', 'i386'], + 'failable': ['*'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', 'subvariant': 'Robotics' @@ -499,14 +511,16 @@ live_images = [ 'armhfp': { 'kickstart': 'fedora-arm-workstation.ks', 'name': 'Fedora-Workstation-armhfp', - 'type': 'appliance' + 'type': 'appliance', + 'failable': True, } }), ('^Server$', { 'armhfp': { 'kickstart': 'fedora-arm-server.ks', 'name': 'Fedora-Server-armhfp', - 'type': 'appliance' + 'type': 'appliance', + 'failable': True, } }), ('^Spins$', { @@ -515,42 +529,48 @@ live_images = [ 'name': 'Fedora-KDE-armhfp', 'repo_from': 'Everything', 'type': 'appliance', - 'subvariant': 'KDE' + 'subvariant': 'KDE', + 'failable': True, }, { 'kickstart': 'fedora-arm-lxde.ks', 'name': 'Fedora-LXDE-armhfp', 'repo_from': 'Everything', 'type': 'appliance', - 'subvariant': 'LXDE' + 'subvariant': 'LXDE', + 'failable': True, }, { 'kickstart': 'fedora-arm-mate.ks', 'name': 'Fedora-Mate-armhfp', 'repo_from': 'Everything', 'type': 'appliance', - 'subvariant': 'Mate' + 'subvariant': 'Mate', + 'failable': True, }, { 'kickstart': 'fedora-arm-minimal.ks', 'name': 'Fedora-Minimal-armhfp', 'repo_from': 'Everything', 'type': 'appliance', - 'subvariant': 'Minimal' + 'subvariant': 'Minimal', + 'failable': False, }, { 'kickstart': 'fedora-arm-soas.ks', 'name': 'Fedora-SoaS-armhfp', 'repo_from': 'Everything', 'type': 'appliance', - 'subvariant': 'SoaS' + 'subvariant': 'SoaS', + 'failable': True, }, { 'kickstart': 'fedora-arm-xfce.ks', 'name': 'Fedora-Xfce-armhfp', 'repo_from': 'Everything', 'type': 'appliance', - 'subvariant': 'Xfce' + 'subvariant': 'Xfce', + 'failable': True, },] }), ] @@ -559,17 +579,21 @@ ostree = [ ("^Atomic$", { "x86_64": { "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", - "ostree_repo": "/mnt/koji/compose/atomic/25/" + "ostree_repo": "/mnt/koji/compose/atomic/25/", + 'failable': ['*'], } }), ("^ostree$", { "x86_64": { "treefile": "fedora-ostree-workstation.json", "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f25", "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", ] 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f25', + 'failable': ['*'], } }), ("^Workstation$", { @@ -614,7 +639,8 @@ ostree_installer = [ "ostree_ref=fedora/25/x86_64/workstation", ] 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f25', + 'failable': ['*'], } }) ]