From 2742bacfadb87d26817bbdf7f3aad3d80fed264a Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Mon, 7 Apr 2025 13:32:11 +0200
Subject: [PATCH] [macOS] Enable indexing for macOS-14 and macOS-15 (#11930)

---
 images/macos/scripts/build/configure-system.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/images/macos/scripts/build/configure-system.sh b/images/macos/scripts/build/configure-system.sh
index 2538f4989..aff5b77cb 100644
--- a/images/macos/scripts/build/configure-system.sh
+++ b/images/macos/scripts/build/configure-system.sh
@@ -56,18 +56,11 @@ yarn cache clean
 # Clean up temporary directories
 sudo rm -rf ~/utils /tmp/*
 
-if is_Ventura; then
-    # Erase all indexes and wait until the rebuilding process ends,
-    # for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish
-    sudo mdutil -E /
-    sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' || true
-    echo "Indexing completed"
-else
-    # Disable spotlight and MDS
-    sudo mdutil -a -i off
-    sudo launchctl unload -w /System/Library/LaunchDaemons/com.apple.metadata.mds.plist
-    sudo mdutil -a -s | grep "Indexing enabled." && echo "Indexing is still enabled" && exit 1 || true
-fi
+# Erase all indexes and wait until the rebuilding process ends,
+# for now there is no way to get status of indexing process, it takes around 5 minutes to accomplish
+sudo mdutil -E /
+sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' || true
+echo "Indexing completed"
 
 # delete symlink for tests running
 sudo rm -f /usr/local/bin/invoke_tests