From f48bb0205c28c184ec7bf829da8212e4b0d91a3f Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Thu, 6 Mar 2025 13:44:34 -0500
Subject: [PATCH 1/2] [CI] Disable all external modules tests for non-snapshot
 builds

---
 test/external-modules/apm-integration/build.gradle  | 4 ----
 test/external-modules/build.gradle                  | 4 ++++
 test/external-modules/delayed-aggs/build.gradle     | 4 ----
 test/external-modules/die-with-dignity/build.gradle | 4 ----
 test/external-modules/error-query/build.gradle      | 5 -----
 test/external-modules/esql-heap-attack/build.gradle | 1 -
 test/external-modules/jvm-crash/build.gradle        | 1 -
 test/external-modules/multi-project/build.gradle    | 4 ++++
 8 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/test/external-modules/apm-integration/build.gradle b/test/external-modules/apm-integration/build.gradle
index 63e149490a9a4..ae3662b518387 100644
--- a/test/external-modules/apm-integration/build.gradle
+++ b/test/external-modules/apm-integration/build.gradle
@@ -24,10 +24,6 @@ tasks.named("test").configure {
   enabled = false
 }
 
-tasks.named('javaRestTest').configure {
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
-}
-
 dependencies {
   clusterModules project(':modules:apm')
   implementation project(':libs:logging')
diff --git a/test/external-modules/build.gradle b/test/external-modules/build.gradle
index dfdc47d9f5beb..3b7d2e424a3f5 100644
--- a/test/external-modules/build.gradle
+++ b/test/external-modules/build.gradle
@@ -15,4 +15,8 @@ subprojects {
     licenseFile = layout.settingsDirectory.file('licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt').asFile
     noticeFile = layout.settingsDirectory.file('NOTICE.txt').asFile
   }
+
+  tasks.named { it == "javaRestTest" || it == "yamlRestTest" }.configureEach {
+    it.onlyIf("snapshot build") { buildParams.snapshotBuild }
+  }
 }
diff --git a/test/external-modules/delayed-aggs/build.gradle b/test/external-modules/delayed-aggs/build.gradle
index 09fe28a459047..99bd383250d2f 100644
--- a/test/external-modules/delayed-aggs/build.gradle
+++ b/test/external-modules/delayed-aggs/build.gradle
@@ -9,10 +9,6 @@
 
 apply plugin: 'elasticsearch.legacy-yaml-rest-test'
 
-tasks.named('yamlRestTest').configure {
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
-}
-
 esplugin {
   description = 'A test module that allows to delay aggregations on shards with a configurable time'
   classname ='org.elasticsearch.test.delayedshard.DelayedShardAggregationPlugin'
diff --git a/test/external-modules/die-with-dignity/build.gradle b/test/external-modules/die-with-dignity/build.gradle
index dbe3c1579b706..bda841248056a 100644
--- a/test/external-modules/die-with-dignity/build.gradle
+++ b/test/external-modules/die-with-dignity/build.gradle
@@ -23,7 +23,3 @@ GradleUtils.extendSourceSet(project, "main", "javaRestTest", tasks.named("javaRe
 tasks.named("test").configure {
   enabled = false
 }
-
-tasks.named('javaRestTest').configure {
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
-}
diff --git a/test/external-modules/error-query/build.gradle b/test/external-modules/error-query/build.gradle
index 39b1c17706bb6..99bd3b7050249 100644
--- a/test/external-modules/error-query/build.gradle
+++ b/test/external-modules/error-query/build.gradle
@@ -12,11 +12,6 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
 
 tasks.named('javaRestTest') {
   usesDefaultDistribution()
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
-}
-
-tasks.named('yamlRestTest').configure {
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
 }
 
 esplugin {
diff --git a/test/external-modules/esql-heap-attack/build.gradle b/test/external-modules/esql-heap-attack/build.gradle
index e760f1bd067c2..2877f4d46a3bb 100644
--- a/test/external-modules/esql-heap-attack/build.gradle
+++ b/test/external-modules/esql-heap-attack/build.gradle
@@ -20,5 +20,4 @@ esplugin {
 
 tasks.named('javaRestTest') {
   usesDefaultDistribution()
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
 }
diff --git a/test/external-modules/jvm-crash/build.gradle b/test/external-modules/jvm-crash/build.gradle
index cf67fdc786e26..13b7e10bbe8cd 100644
--- a/test/external-modules/jvm-crash/build.gradle
+++ b/test/external-modules/jvm-crash/build.gradle
@@ -20,5 +20,4 @@ esplugin {
 
 tasks.named('javaRestTest') {
   usesDefaultDistribution()
-  it.onlyIf("snapshot build") { buildParams.snapshotBuild }
 }
diff --git a/test/external-modules/multi-project/build.gradle b/test/external-modules/multi-project/build.gradle
index aa0b45242c27d..5970226d1ef87 100644
--- a/test/external-modules/multi-project/build.gradle
+++ b/test/external-modules/multi-project/build.gradle
@@ -17,3 +17,7 @@ dependencies {
 tasks.withType(StandaloneRestIntegTestTask).configureEach {
   usesDefaultDistribution()
 }
+
+tasks.named("javaRestTest").configure {
+  enabled = buildParams.snapshotBuild
+}

From 0a621b0a01558f110088c72512199cc55feab63f Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Thu, 6 Mar 2025 16:16:57 -0500
Subject: [PATCH 2/2] Remove unused javaRestTest task configuration

---
 test/external-modules/multi-project/build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/external-modules/multi-project/build.gradle b/test/external-modules/multi-project/build.gradle
index 5970226d1ef87..aa0b45242c27d 100644
--- a/test/external-modules/multi-project/build.gradle
+++ b/test/external-modules/multi-project/build.gradle
@@ -17,7 +17,3 @@ dependencies {
 tasks.withType(StandaloneRestIntegTestTask).configureEach {
   usesDefaultDistribution()
 }
-
-tasks.named("javaRestTest").configure {
-  enabled = buildParams.snapshotBuild
-}