From f0914eb6f559c250bf6677a463323b1706395f45 Mon Sep 17 00:00:00 2001
From: Karel Simon <ksimon@redhat.com>
Date: Mon, 24 Feb 2020 10:41:47 +0100
Subject: [PATCH] remove win 10 label from windows template (there is separate
 win10 template) remove desktop workload from windows template (windows
 template contains only server editions)

Signed-off-by: Karel Simon <ksimon@redhat.com>
---
 automation/test-windows.sh | 2 +-
 generate-templates.yaml    | 2 --
 templates/windows.tpl.yaml | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/automation/test-windows.sh b/automation/test-windows.sh
index 8cd51c02..aa8147f8 100755
--- a/automation/test-windows.sh
+++ b/automation/test-windows.sh
@@ -87,7 +87,7 @@ _oc exec -it winrmcli -- yum install -y iproute iputils net-tools arp-scan
 kubeconfig=$( cluster-up/kubeconfig.sh )
 
 sizes=("medium" "large")
-workloads=("server" "desktop")
+workloads=("server")
 
 if [[ $TARGET =~ windows10.* ]]; then
   template_name="windows10"
diff --git a/generate-templates.yaml b/generate-templates.yaml
index cb79aded..6f31dfd6 100644
--- a/generate-templates.yaml
+++ b/generate-templates.yaml
@@ -219,9 +219,7 @@
       dest: "{{ playbook_dir }}/dist/templates/windows-{{ item.workload }}-{{ item.flavor }}.yaml"
     with_items:
     - {flavor: medium, workload: server, memsize: "4Gi", cpus: 1, iothreads: False, tablet: False}
-    - {flavor: medium, workload: desktop, memsize: "4Gi", cpus: 1, iothreads: False, tablet: True}
     - {flavor: large, workload: server, memsize: "8Gi", cpus: 2, iothreads: False, tablet: False}
-    - {flavor: large, workload: desktop, memsize: "8Gi", cpus: 2, iothreads: False, tablet: True}
     vars:
       osinfoname: win2k12r2
 
diff --git a/templates/windows.tpl.yaml b/templates/windows.tpl.yaml
index 234308e8..3b274708 100644
--- a/templates/windows.tpl.yaml
+++ b/templates/windows.tpl.yaml
@@ -31,7 +31,6 @@ metadata:
     name.os.template.kubevirt.io/win2k12r2: {{ lookup('osinfo', 'win2k12r2').name }}
     name.os.template.kubevirt.io/win2k8r2: {{ lookup('osinfo', 'win2k8r2').name }}
     name.os.template.kubevirt.io/win2k8: {{ lookup('osinfo', 'win2k8').name }}
-    name.os.template.kubevirt.io/win10: {{ lookup('osinfo', 'win10').name }}
 
     validations: |
       [