From f3d011eec1140de7544c9dbf4824a396f25c8447 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:59:45 +0200 Subject: [PATCH] [MacOS] Unpin Virtualbox (#8653) * [MacOS] Unpin Virtualbox * Remove obsolete virtualbox kext pester test --- images/macos/provision/core/commonutils.sh | 13 +------------ images/macos/tests/Common.Tests.ps1 | 6 ------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/images/macos/provision/core/commonutils.sh b/images/macos/provision/core/commonutils.sh index d93cb708cdd9..1f472d2d4a96 100644 --- a/images/macos/provision/core/commonutils.sh +++ b/images/macos/provision/core/commonutils.sh @@ -13,18 +13,7 @@ done cask_packages=$(get_toolset_value '.brew.cask_packages[]') for package in $cask_packages; do echo "Installing $package..." - if [[ $package == "virtualbox" ]]; then - if ! is_Ventura || ! is_VenturaArm64; then - # VirtualBox 7 crashes - # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now. - vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb" - download_with_retries $vbcask_url - brew install ./virtualbox.rb - rm ./virtualbox.rb - fi - else - brew install --cask $package - fi + brew install --cask $package done # Load "Parallels International GmbH" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index e1e645e7f5af..9e278773363e 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -123,12 +123,6 @@ Describe "Go" -Skip:($os.IsVentura -or $os.IsVenturaArm64) { } } -Describe "VirtualBox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsVenturaArm64) { - It "Check kext kernel modules" { - kextstat | Out-String | Should -Match "org.virtualbox.kext" - } -} - Describe "CodeQL Bundle" { It "Is installed" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*"