From dfe7d458d66ebb4f2cee7bc2db7e70167828095c Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Fri, 14 Mar 2025 16:02:07 +0100 Subject: [PATCH 1/4] declare test cluster module requirement explicitly in mapper-murmur - Update restrited buildservice --- .../gradle/internal/RestrictedBuildApiService.java | 5 ----- plugins/mapper-murmur3/build.gradle | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java index 6d538f207702d..3aa05aaf8d78c 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java @@ -50,7 +50,6 @@ private static ListMultimap, String> createLegacyRestTestBasePluginUsag map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-gce"); map.put(LegacyRestTestBasePlugin.class, ":plugins:mapper-annotated-text"); map.put(LegacyRestTestBasePlugin.class, ":plugins:mapper-murmur3"); - map.put(LegacyRestTestBasePlugin.class, ":plugins:repository-hdfs"); map.put(LegacyRestTestBasePlugin.class, ":plugins:store-smb"); map.put(LegacyRestTestBasePlugin.class, ":qa:ccs-rolling-upgrade-remote-cluster"); map.put(LegacyRestTestBasePlugin.class, ":qa:mixed-cluster"); @@ -74,11 +73,7 @@ private static ListMultimap, String> createLegacyRestTestBasePluginUsag map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:logstash"); - map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:mapper-constant-keyword"); - map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:mapper-unsigned-long"); - map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:mapper-version"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:vector-tile"); - map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:wildcard"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:mixed-tier-cluster"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:repository-old-versions"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:rolling-upgrade"); diff --git a/plugins/mapper-murmur3/build.gradle b/plugins/mapper-murmur3/build.gradle index 54423b2b990dd..84cbb6685357e 100644 --- a/plugins/mapper-murmur3/build.gradle +++ b/plugins/mapper-murmur3/build.gradle @@ -21,6 +21,10 @@ dependencies { clusterModules project(':modules:lang-painless') } +testClusters.configureEach { + module ":modules:lang-painless" +} + restResources { restApi { include '_common', 'indices', 'index', 'search' From 43fb029692a7cb3e5e3835acace41527858d5ebd Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Fri, 14 Mar 2025 16:07:49 +0100 Subject: [PATCH 2/4] do not autoconfigure test cluster modules for internal plugin extensions --- .../BaseInternalPluginBuildPlugin.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java index 6a1df303d6d9e..aa48480cc6e58 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java @@ -81,29 +81,6 @@ public void doCall() { if (isModule == false || isXPackModule) { addNoticeGeneration(project, extension); } - project.afterEvaluate(p -> { - @SuppressWarnings("unchecked") - NamedDomainObjectContainer testClusters = (NamedDomainObjectContainer) project - .getExtensions() - .getByName(TestClustersPlugin.EXTENSION_NAME); - p.getExtensions().getByType(PluginPropertiesExtension.class).getExtendedPlugins().forEach(pluginName -> { - // Auto add any dependent modules - findModulePath(project, pluginName).ifPresent( - path -> testClusters.configureEach(elasticsearchCluster -> elasticsearchCluster.module(path)) - ); - }); - }); - } - - Optional findModulePath(Project project, String pluginName) { - return project.getRootProject() - .getAllprojects() - .stream() - .filter(p -> GradleUtils.isModuleProject(p.getPath())) - .filter(p -> p.getPlugins().hasPlugin(PluginBuildPlugin.class)) - .filter(p -> p.getExtensions().getByType(PluginPropertiesExtension.class).getName().equals(pluginName)) - .findFirst() - .map(Project::getPath); } /** From ce2aef62be14c05e9edbf6b0febf5faea6b0f053 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Fri, 14 Mar 2025 16:12:18 +0100 Subject: [PATCH 3/4] Murmur3 plugin not using test cluster --- .../gradle/internal/RestrictedBuildApiService.java | 1 - plugins/mapper-murmur3/build.gradle | 4 ---- 2 files changed, 5 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java index 3aa05aaf8d78c..c9833eab3ddb0 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java @@ -49,7 +49,6 @@ private static ListMultimap, String> createLegacyRestTestBasePluginUsag map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-ec2"); map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-gce"); map.put(LegacyRestTestBasePlugin.class, ":plugins:mapper-annotated-text"); - map.put(LegacyRestTestBasePlugin.class, ":plugins:mapper-murmur3"); map.put(LegacyRestTestBasePlugin.class, ":plugins:store-smb"); map.put(LegacyRestTestBasePlugin.class, ":qa:ccs-rolling-upgrade-remote-cluster"); map.put(LegacyRestTestBasePlugin.class, ":qa:mixed-cluster"); diff --git a/plugins/mapper-murmur3/build.gradle b/plugins/mapper-murmur3/build.gradle index 84cbb6685357e..54423b2b990dd 100644 --- a/plugins/mapper-murmur3/build.gradle +++ b/plugins/mapper-murmur3/build.gradle @@ -21,10 +21,6 @@ dependencies { clusterModules project(':modules:lang-painless') } -testClusters.configureEach { - module ":modules:lang-painless" -} - restResources { restApi { include '_common', 'indices', 'index', 'search' From 78a4fa109e9c72d4f04cba43bce8e8c969f06841 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Fri, 14 Mar 2025 15:21:36 +0000 Subject: [PATCH 4/4] [CI] Auto commit changes from spotless --- .../gradle/internal/BaseInternalPluginBuildPlugin.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java index aa48480cc6e58..b6f4c99e3d0e6 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java @@ -17,10 +17,7 @@ import org.elasticsearch.gradle.internal.test.ClusterFeaturesMetadataPlugin; import org.elasticsearch.gradle.plugin.PluginBuildPlugin; import org.elasticsearch.gradle.plugin.PluginPropertiesExtension; -import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; -import org.elasticsearch.gradle.testclusters.TestClustersPlugin; import org.elasticsearch.gradle.util.GradleUtils; -import org.gradle.api.NamedDomainObjectContainer; import org.gradle.api.Plugin; import org.gradle.api.Project;