From 3df52c848fbfa3ae8c4f5bfea197f2b57d07aacc Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Tue, 23 Sep 2025 16:02:17 -0400
Subject: [PATCH 1/6] Test: Turn off gradle file watcher for Windows acceptance
 tests

---
 ci/unit_tests.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/unit_tests.ps1 b/ci/unit_tests.ps1
index b070c61ffe7..af3ca7431b5 100644
--- a/ci/unit_tests.ps1
+++ b/ci/unit_tests.ps1
@@ -68,9 +68,9 @@ else {
 
 if (Test-Path Env:BUILD_JAVA_HOME) {    
     if (Test-Path Env:GRADLE_OPTS) {    
-        $env:GRADLE_OPTS=$env:GRADLE_OPTS + " " + "-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
+        $env:GRADLE_OPTS=$env:GRADLE_OPTS + " -Dorg.gradle.vfs.watch=false -Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
     } else {
-        $env:GRADLE_OPTS="-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
+        $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
     }
 }
 

From 77b89390aa05049f6b9dddbf3b94c96838998eff Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Fri, 26 Sep 2025 16:17:56 -0400
Subject: [PATCH 2/6] Also set filewatcher to false if build_java_home is blank

---
 ci/unit_tests.ps1 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ci/unit_tests.ps1 b/ci/unit_tests.ps1
index af3ca7431b5..18492a93627 100644
--- a/ci/unit_tests.ps1
+++ b/ci/unit_tests.ps1
@@ -68,12 +68,20 @@ else {
 
 if (Test-Path Env:BUILD_JAVA_HOME) {    
     if (Test-Path Env:GRADLE_OPTS) {    
-        $env:GRADLE_OPTS=$env:GRADLE_OPTS + " -Dorg.gradle.vfs.watch=false -Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
+        $env:GRADLE_OPTS=$env:GRADLE_OPTS + " -Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
     } else {
-        $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
+        $env:GRADLE_OPTS="-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
     }
+} 
+
+# Disable the file watcher to retain compatibility with Windows 2016
+if (Test-Path Env:GRADLE_OPTS) {    
+    $env:GRADLE_OPTS="$env:GRADLE_OPTS -Dorg.gradle.vfs.watch=false"
+} else {
+    $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false"
 }
 
+
 $testOpts = "GRADLE_OPTS: $env:GRADLE_OPTS, BUILD_JAVA_HOME: $env:BUILD_JAVA_HOME"
 
 try {

From 8b84a8f8067e4aec9f276da874614b01564c98a6 Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Fri, 26 Sep 2025 16:38:36 -0400
Subject: [PATCH 3/6] Update unit_tests.ps1

---
 ci/unit_tests.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/unit_tests.ps1 b/ci/unit_tests.ps1
index 18492a93627..85b08698b41 100644
--- a/ci/unit_tests.ps1
+++ b/ci/unit_tests.ps1
@@ -76,9 +76,9 @@ if (Test-Path Env:BUILD_JAVA_HOME) {
 
 # Disable the file watcher to retain compatibility with Windows 2016
 if (Test-Path Env:GRADLE_OPTS) {    
-    $env:GRADLE_OPTS="$env:GRADLE_OPTS -Dorg.gradle.vfs.watch=false"
+    $env:GRADLE_OPTS="$env:GRADLE_OPTS -Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
 } else {
-    $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false"
+    $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
 }
 
 

From 65508d8772cd6134cf1aa6269abd897d5452262c Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Fri, 26 Sep 2025 16:40:40 -0400
Subject: [PATCH 4/6] Force smaller set of VMs

---
 .buildkite/scripts/common/vm-images.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.buildkite/scripts/common/vm-images.json b/.buildkite/scripts/common/vm-images.json
index bd1f0d3ed42..282646e96eb 100644
--- a/.buildkite/scripts/common/vm-images.json
+++ b/.buildkite/scripts/common/vm-images.json
@@ -1,13 +1,7 @@
 {
     "#comment": "This file lists all custom vm images. We use it to make decisions about randomized CI jobs.",
     "linux": {
-        "ubuntu": ["ubuntu-2404", "ubuntu-2204", "ubuntu-2004"],
-        "debian": ["debian-12", "debian-11"],
-        "rhel": ["rhel-9", "rhel-8"],
-        "oraclelinux": ["oraclelinux-8", "oraclelinux-7"],
-        "rocky": ["rocky-linux-8"],
-        "amazonlinux": ["amazonlinux-2023"],
         "opensuse": ["opensuse-leap-15"]
     },
-    "windows": ["windows-2025", "windows-2022", "windows-2019", "windows-2016"]
+    "windows": ["windows-2016"]
 }

From 734e3ad750912d270d996defbda369b8521744ea Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Fri, 26 Sep 2025 17:17:20 -0400
Subject: [PATCH 5/6] add scan logging and add no-watch-fs to the command-line
 invocation

---
 ci/unit_tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/unit_tests.ps1 b/ci/unit_tests.ps1
index 85b08698b41..85718e0b785 100644
--- a/ci/unit_tests.ps1
+++ b/ci/unit_tests.ps1
@@ -97,7 +97,7 @@ try {
     }
     else {
         Write-Host "~~~ Running all tests via Gradle using $testOpts"
-        $CIScript = ".\gradlew.bat test --console=plain --no-daemon --info"
+        $CIScript = ".\gradlew.bat test --console=plain --no-daemon  --no-watch-fs --scan"
         Invoke-Expression $CIScript
     }
 

From 7cdd3ffed973af85062260bb3ad7cded14fb38ea Mon Sep 17 00:00:00 2001
From: Rob Bavey <rob.bavey@elastic.co>
Date: Fri, 26 Sep 2025 17:51:53 -0400
Subject: [PATCH 6/6] Set gradle_opts directly in ENV to apply to native
 services in daemon, which gets created regardless of `--no-daemon`

---
 ci/unit_tests.ps1 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/unit_tests.ps1 b/ci/unit_tests.ps1
index 85718e0b785..e222a52c75f 100644
--- a/ci/unit_tests.ps1
+++ b/ci/unit_tests.ps1
@@ -75,12 +75,13 @@ if (Test-Path Env:BUILD_JAVA_HOME) {
 } 
 
 # Disable the file watcher to retain compatibility with Windows 2016
-if (Test-Path Env:GRADLE_OPTS) {    
-    $env:GRADLE_OPTS="$env:GRADLE_OPTS -Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
-} else {
-    $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
-}
+#if (Test-Path Env:GRADLE_OPTS) {    
+#    $env:GRADLE_OPTS="$env:GRADLE_OPTS -Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
+#} else {
+#    $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
+#}
 
+$env:ORG_GRADLE_JVMARGS = "-Dorg.gradle.vfs.watch=false  -Dorg.gradle.daemon=false"
 
 $testOpts = "GRADLE_OPTS: $env:GRADLE_OPTS, BUILD_JAVA_HOME: $env:BUILD_JAVA_HOME"