refactor: remove chocolatey from windows builds (#586)

Removes the installation of Chocolatey from the Microsoft Windows guest operating system builds. .Net 4.8 is required before installation. This can be managed by the user instead of this project. Ref: #585 Signed-off-by: Ryan Johnson <johnsonryan@vmware.com>
vmware-samples · Jun 15, 2023 · 1975b25 · 1975b25
1 parent 5710509
commit 1975b25
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,11 @@
 - Updates CentOS Stream 8 to latest June 2023 release. [GH-568](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/568)
 - Updates Windows Server 2022 to May 2023 (US English) release. [GH-579](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/579)
 - Updates Windows 11 22H2 to May 2023 (US English) release. [GH-580](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/580), [GH-583](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/583)
-- Updates Windows 10 22H2 to May 2023 (US English) release. [GH-581](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/581)
+- Updates Windows 10 22H2 to May 2023 (US English) release. [GH-575](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/581)
+
+:wrench: **Refactor**:
+
+- Removes the installation of Chocolatey from the Microsoft Windows guest operating system builds. [GH-586](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/586)
 
 ## [v23.01](https://github.com/vmware-samples/packer-examples-for-vsphere/releases/tag/v23.01)
 

diff --git a/builds/windows/desktop/10/windows.auto.pkrvars.hcl b/builds/windows/desktop/10/windows.auto.pkrvars.hcl
@@ -55,7 +55,5 @@ communicator_timeout = "12h"
 // Provisioner Settings
 scripts = ["scripts/windows/windows-prepare.ps1"]
 inline = [
-  "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))",
-  "choco feature enable -n allowGlobalConfirmation",
   "Get-EventLog -LogName * | ForEach { Clear-EventLog -LogName $_.Log }"
 ]
diff --git a/builds/windows/desktop/11/windows.auto.pkrvars.hcl b/builds/windows/desktop/11/windows.auto.pkrvars.hcl
@@ -56,7 +56,5 @@ communicator_timeout = "12h"
 // Provisioner Settings
 scripts = ["scripts/windows/windows-prepare.ps1"]
 inline = [
-  "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))",
-  "choco feature enable -n allowGlobalConfirmation",
   "Get-EventLog -LogName * | ForEach { Clear-EventLog -LogName $_.Log }"
 ]
diff --git a/builds/windows/server/2019/windows-server.auto.pkrvars.hcl b/builds/windows/server/2019/windows-server.auto.pkrvars.hcl
@@ -60,7 +60,5 @@ communicator_timeout = "12h"
 // Provisioner Settings
 scripts = ["scripts/windows/windows-prepare.ps1"]
 inline = [
-  "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))",
-  "choco feature enable -n allowGlobalConfirmation",
   "Get-EventLog -LogName * | ForEach { Clear-EventLog -LogName $_.Log }"
 ]
diff --git a/builds/windows/server/2022/windows-server.auto.pkrvars.hcl b/builds/windows/server/2022/windows-server.auto.pkrvars.hcl
@@ -60,7 +60,5 @@ communicator_timeout = "12h"
 // Provisioner Settings
 scripts = ["scripts/windows/windows-prepare.ps1"]
 inline = [
-  "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))",
-  "choco feature enable -n allowGlobalConfirmation",
   "Get-EventLog -LogName * | ForEach { Clear-EventLog -LogName $_.Log }"
 ]