From 600dbda3aaf59a6475016f28a6f4bfaef0eee4f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Apr 20 2016 16:35:51 +0000 Subject: Revert "add ostree workstation to rawhide" This reverts commit a285c9d37a832ec11b6bd1fecfe134d2d8df692c. --- diff --git a/fedora.conf b/fedora.conf index 64cce76..2ac6111 100644 --- a/fedora.conf +++ b/fedora.conf @@ -600,16 +600,7 @@ ostree = [ "source_repo_from": "Everything", "ostree_repo": "/mnt/koji/compose/atomic/rawhide/" } - }), - ("^Workstation$", { - "x86_64": { - "treefile": "fedora-atomic-workstation-default.json", - "config_url": "https://pagure.io/atomic-workstation-config.git", - "source_repo_from": "Everything", - "ostree_repo": "/mnt/koji/compose/atomic/rawhide/" - } }) - ] ostree_installer = [ @@ -633,27 +624,6 @@ ostree_installer = [ 'template_repo': 'https://git.fedorahosted.org/git/spin-kickstarts.git', 'template_branch': 'master', } - }), - ("^Workstation$", { - "x86_64": { - "source_repo_from": "Everything", - "release": None, - "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso", - "installpkgs": ["fedora-productimg-workstation"], - "add_template": ["atomic-installer/lorax-configure-repo.tmpl"], - "add_template_var": [ - "ostree_osname=fedora-ostree-workstation", - "ostree_ref=fedora-atomic-workstation/rawhide/x86_64/default", - ], - "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"], - "add_arch_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", - "ostree_osname=fedora-ostree-workstation", - "ostree_ref=fedora-atomic-workstation/rawhide/x86_64/default", - ] - 'template_repo': 'https://git.fedorahosted.org/git/spin-kickstarts.git', - 'template_branch': 'master', - } }) ]