Merge branch 'main' into jdk25/asm

Author: mosche

x-pack/plugin/downsample/build.gradle

@@ -12,10 +12,10 @@ base {
 }
 
 dependencies {
-  compileOnly project(path: xpackModule('core'))
+  compileOnly project(xpackModule('core'))
   testImplementation project(':modules:data-streams')
-  testImplementation project(path: xpackModule('ilm'))
-  compileOnly project(path: xpackModule('mapper-aggregate-metric'))
+  testImplementation project(xpackModule('ilm'))
+  compileOnly project(xpackModule('mapper-aggregate-metric'))
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation project(xpackModule('ccr'))
   testImplementation project(xpackModule('esql'))

x-pack/plugin/downsample/qa/rest/build.gradle

@@ -10,8 +10,17 @@ apply plugin: 'elasticsearch.yaml-rest-compat-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 
 dependencies {
-  testImplementation project(path: ':test:test-clusters')
-  yamlRestTestImplementation project(path: xpackModule('rollup'))
+  testImplementation project(':test:test-clusters')
+  yamlRestTestImplementation project(xpackModule('rollup'))
+
+  clusterModules project(xpackModule('downsample'))
+  clusterModules project(xpackModule('analytics'))
+  clusterModules project(xpackModule('ilm'))
+  clusterModules project(':modules:lang-painless')
+  clusterModules project(':modules:mapper-extras')
+  clusterModules project(':modules:data-streams')
+  clusterModules project(':modules:aggregations')
+  clusterModules project(':modules:ingest-common')
 }
 
 restResources {
@@ -24,12 +33,6 @@ artifacts {
   restXpackTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test"))
 }
 
-tasks.named('yamlRestTest') {
-  usesDefaultDistribution("to be triaged")
-}
-tasks.named('yamlRestCompatTest') {
-  usesDefaultDistribution("to be triaged")
-}
 if (buildParams.inFipsJvm){
   // This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC
   tasks.named("yamlRestTest").configure{enabled = false }

x-pack/plugin/downsample/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/DownsampleRestIT.java

@@ -10,7 +10,6 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
-import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 import org.junit.ClassRule;
@@ -19,7 +18,14 @@ public class DownsampleRestIT extends ESClientYamlSuiteTestCase {
 
     @ClassRule
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
-        .distribution(DistributionType.DEFAULT)
+        .module("x-pack-downsample")
+        .module("x-pack-ilm")
+        .module("lang-painless")
+        .module("aggregations")     // for auto_date_histogram
+        .module("mapper-extras")    // for scaled_float
+        .module("x-pack-analytics") // for histogram
+        .module("data-streams")     // for time series
+        .module("ingest-common")
         .setting("xpack.license.self_generated.type", "trial")
         .setting("xpack.security.enabled", "false")
         .build();

x-pack/plugin/downsample/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/DownsampleWithBasicRestIT.java

@@ -10,7 +10,6 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
-import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 import org.junit.ClassRule;
@@ -19,7 +18,14 @@ public class DownsampleWithBasicRestIT extends ESClientYamlSuiteTestCase {
 
     @ClassRule
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
-        .distribution(DistributionType.DEFAULT)
+        .module("x-pack-downsample")
+        .module("x-pack-ilm")
+        .module("lang-painless")
+        .module("aggregations")     // for auto_date_histogram
+        .module("mapper-extras")    // for scaled_float
+        .module("x-pack-analytics") // for histogram
+        .module("data-streams")     // for time series
+        .module("ingest-common")
         .setting("xpack.security.enabled", "false")
         .build();
 

x-pack/plugin/downsample/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/DownsampleWithSecurityRestIT.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
-import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
 import org.junit.ClassRule;
@@ -25,7 +24,8 @@ public class DownsampleWithSecurityRestIT extends ESClientYamlSuiteTestCase {
 
     @ClassRule
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
-        .distribution(DistributionType.DEFAULT)
+        .module("x-pack-downsample")
+        .module("x-pack-analytics") // for histogram
         .setting("xpack.license.self_generated.type", "trial")
         .setting("xpack.security.enabled", "true")
         .user(USERNAME, PASSWORD)