From 32d213064f3575cdc6b05f3e317e8a1341cfdbac Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:04:30 +0200
Subject: [PATCH] [macos] remove vagrant from macos 13 (#8283)

---
 images/macos/software-report/SoftwareReport.Generator.ps1 | 6 ++----
 images/macos/tests/BasicTools.Tests.ps1                   | 2 +-
 images/macos/toolsets/toolset-13.json                     | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 58254d5ae..5032c798f 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -142,11 +142,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
     $utilities.AddToolVersion("Subversion (SVN)", $(Get-SVNVersion))
     $utilities.AddToolVersion("Switchaudio-osx", $(Get-SwitchAudioOsxVersion))
 }
-if (-not $os.IsBigSur) {
+if ((-not $os.IsBigSur) -and (-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
     $utilities.AddToolVersion("Vagrant", $(Get-VagrantVersion))
-    if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
-        $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion))
-    }
+    $utilities.AddToolVersion("VirtualBox", $(Get-VirtualBoxVersion))
 }
 $utilities.AddToolVersion("yq", $(Get-YqVersion))
 $utilities.AddToolVersion("zstd", $(Get-ZstdVersion))
diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1
index 5ca408c40..345772ffe 100644
--- a/images/macos/tests/BasicTools.Tests.ps1
+++ b/images/macos/tests/BasicTools.Tests.ps1
@@ -139,7 +139,7 @@ Describe "wget" {
     }
 }
 
-Describe "vagrant" -Skip:($os.IsBigSur) {
+Describe "vagrant" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) {
     It "vagrant" {
         "vagrant --version" | Should -ReturnZeroExitCode
     }
diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
index 9f67c0b50..18edac75c 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -70,8 +70,7 @@
             "unxip"
         ],
         "cask_packages": [
-            "julia",
-            "vagrant"
+            "julia"
         ]
     },
     "gcc": {