From 4454035fe65f30debcd4c65dc83cbabe9727ce78 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Mon, 17 Feb 2025 16:09:09 +0100
Subject: [PATCH 1/3] Fix lucene compatibility tests

- failing due to buildscan setup
---
 .ci/init.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.ci/init.gradle b/.ci/init.gradle
index 04243b433eebd..5bb280bcebd12 100644
--- a/.ci/init.gradle
+++ b/.ci/init.gradle
@@ -4,7 +4,10 @@ final boolean buildCachePush = Boolean.valueOf(System.getProperty('org.elasticse
 gradle.settingsEvaluated { settings ->
   settings.pluginManager.withPlugin("com.gradle.develocity") {
     settings.develocity {
-      server = "https://gradle-enterprise.elastic.co"
+      // Workaround to fix lucene compatibility tests
+      if (System.getenv("ES_COMMIT") != "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578") {
+        server = "https://gradle-enterprise.elastic.co"
+      } 
     }
     if (buildCacheUrl) {
       settings.buildCache {

From de73d20f4ff5af361a5cf608594e8afcc502b60d Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Mon, 17 Feb 2025 16:47:13 +0100
Subject: [PATCH 2/3] Update reference to luceneBwcTest commit

---
 .buildkite/pipelines/intake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
index 5c34e242d62c3..1f74c5a6fab67 100644
--- a/.buildkite/pipelines/intake.yml
+++ b/.buildkite/pipelines/intake.yml
@@ -76,7 +76,7 @@ steps:
             ES_VERSION:
               - "9.0.0"
             ES_COMMIT:
-              - "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
+              - "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump / head of combat-lucene-10-0-0
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

From 507c3fb477cdfcf851b1091c7d991df27d1e5740 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Mon, 17 Feb 2025 16:47:21 +0100
Subject: [PATCH 3/3] Revert "Fix lucene compatibility tests"

This reverts commit 4454035fe65f30debcd4c65dc83cbabe9727ce78.
---
 .ci/init.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.ci/init.gradle b/.ci/init.gradle
index 5bb280bcebd12..04243b433eebd 100644
--- a/.ci/init.gradle
+++ b/.ci/init.gradle
@@ -4,10 +4,7 @@ final boolean buildCachePush = Boolean.valueOf(System.getProperty('org.elasticse
 gradle.settingsEvaluated { settings ->
   settings.pluginManager.withPlugin("com.gradle.develocity") {
     settings.develocity {
-      // Workaround to fix lucene compatibility tests
-      if (System.getenv("ES_COMMIT") != "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578") {
-        server = "https://gradle-enterprise.elastic.co"
-      } 
+      server = "https://gradle-enterprise.elastic.co"
     }
     if (buildCacheUrl) {
       settings.buildCache {