From ab2c13650728c1ffaa8e31a56a8347ac083c7bc9 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Tue, 6 Aug 2019 12:17:25 -0400
Subject: [PATCH] stop building Workstation repo

Similar to what we did for Cloud (6eecb53) we need to stop building
Workstation repos so we can speed up our compose times (see [1]).
We already switched to sourcing from the Everything repo (39683dd).
Now we just need to stop building the repo. This commit makes it so
that we will no longer build the yum repo for Workstation.

[1] https://pagure.io/releng/issue/7403

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
---
 fedora.conf         | 17 +++--------------
 variants-fedora.xml | 26 +-------------------------
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/fedora.conf b/fedora.conf
index 51ace8c..54ebfd1 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -124,7 +124,7 @@ lorax_options = [
 
 # fomat: [(variant_uid_regex, {arch|*: [packages]})]
 additional_packages = [
-    ('^(Workstation|Server|Everything)$', {
+    ('^(Server|Everything)$', {
         '*': [
             'kernel*',
             'dracut*',
@@ -152,12 +152,6 @@ additional_packages = [
         ],
     }),
 
-    ('^Workstation$', {
-        '*': [
-
-        ],
-    }),
-
 ]
 
 multilib = [
@@ -168,7 +162,7 @@ multilib = [
 
 filter_packages = [
     ("^.*$", {"*": ["glibc32", "libgcc32"]}),
-    ('(Workstation|Server)$', {
+    ('(Server)$', {
         '*': [
         'kernel*debug*',
         'kernel-kdump*',
@@ -214,11 +208,6 @@ multilib_whitelist = {
 }
 
 createiso_skip = [
-        ('^Workstation$', {
-            '*': True,
-            'src': True
-        }),
-
         ('^Server$', {
             'src': True
         }),
@@ -237,7 +226,7 @@ createiso_skip = [
 
 # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
 #extra_files = [
-#    ('^(Server|Workstation)$', {
+#    ('^(Server)$', {
 #        '*': [
 #            {
 #                'scm': 'rpm',
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 7df854f..928ef12 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -70,36 +70,12 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
-    <variant id="Workstation" name="Workstation" type="variant">
+    <variant id="Workstation" name="Workstation" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
             <arch>x86_64</arch>
         </arches>
-        <groups>
-            <group default="true">base-x</group>
-            <group default="true">container-management</group>
-            <group default="true">core</group>
-            <group default="true">firefox</group>
-            <group default="true">fonts</group>
-            <group default="true">gnome-desktop</group>
-            <group default="true">guest-desktop-agents</group>
-            <group default="true">hardware-support</group>
-            <group default="true">libreoffice</group>
-            <group default="true">multimedia</group>
-            <group default="true">networkmanager-submodules</group>
-            <group default="true">printing</group>
-            <group default="true">workstation-ostree-support</group>
-            <group default="true">workstation-product</group>
-            <group default="true">virtualization</group>
-            <group default="true">arm-tools</group>
-            <!-- Things needed for installation -->
-            <group default="true">anaconda-tools</group>
-            <group default="true">platform-vmware</group>
-        </groups>
-        <environments>
-          <environment display_order="10">workstation-product-environment</environment>
-        </environments>
     </variant>
     <variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">
         <arches>