From b386372a86db318d6554227053cc58e93eeb8d9a Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Fri, 29 Jan 2021 18:16:05 +0300
Subject: [PATCH] [windows] Remove Hyper-V installation and switch VM size to
 standard d8s v4 (#2525)

* change vm spec to Standard_D8s_v4 for win images

* Remove Hyper-V feature
---
 .../win/scripts/Installers/Install-ContainersFeature.ps1  | 8 --------
 images/win/windows2016.json                               | 2 +-
 images/win/windows2019.json                               | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/images/win/scripts/Installers/Install-ContainersFeature.ps1 b/images/win/scripts/Installers/Install-ContainersFeature.ps1
index 2fc9d8f2d..dbc0dbb68 100644
--- a/images/win/scripts/Installers/Install-ContainersFeature.ps1
+++ b/images/win/scripts/Installers/Install-ContainersFeature.ps1
@@ -8,12 +8,4 @@
 Write-Host "Install Containers feature"
 Install-WindowsFeature -Name Containers
 
-$cpu = (Get-CimInstance -ClassName Win32_Processor)[0]
-if ($cpu.VirtualizationFirmwareEnabled -and $cpu.SecondLevelAddressTranslationExtensions) {
-  Write-Host "Install Hyper-V feature"
-  Install-WindowsFeature -Name Hyper-V -IncludeManagementTools
-} else {
-  Write-Host "Skipping installation of Hyper-V feature"
-}
-
 Invoke-PesterTests -TestFile "WindowsFeatures" -TestName "ContainersFeature"
\ No newline at end of file
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index c491d6112..3db5bd6fd 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -13,7 +13,7 @@
         "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}",
         "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
-        "vm_size": "Standard_DS4_v2",
+        "vm_size": "Standard_D8s_v4",
         "run_scan_antivirus": "false",
         "root_folder": "C:",
         "toolset_json_path": "{{env `TEMP`}}\\toolset.json",
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index 4ce73b8ed..a4df7fa20 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -13,7 +13,7 @@
         "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}",
         "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}",
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
-        "vm_size": "Standard_DS4_v2",
+        "vm_size": "Standard_D8s_v4",
         "run_scan_antivirus": "false",
         "root_folder": "C:",
         "toolset_json_path": "{{env `TEMP`}}\\toolset.json",