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 f0aff29d42aa7..c7da5683ee413 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 @@ -36,12 +36,6 @@ private static ListMultimap, String> createLegacyRestTestBasePluginUsag map.put(LegacyRestTestBasePlugin.class, ":qa:remote-clusters"); map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version"); map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy"); - map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-apm-integration"); - map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-delayed-aggs"); - map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-die-with-dignity"); - map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-error-query"); - map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-latency-simulating-directory"); - map.put(LegacyRestTestBasePlugin.class, ":test:yaml-rest-runner"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:core"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet"); @@ -60,8 +54,6 @@ private static ListMultimap, String> createLegacyRestTestBasePluginUsag map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:smoke-test-plugins-ssl"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:smoke-test-security-with-mustache"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:xpack-prefix-rest-compat"); - map.put(LegacyRestTestBasePlugin.class, ":modules:ingest-geoip:qa:file-based-update"); - map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-gce:qa:gce"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-basic-license"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-full-license"); map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-restricted-trust"); diff --git a/test/external-modules/delayed-aggs/build.gradle b/test/external-modules/delayed-aggs/build.gradle index 09fe28a459047..430563aa8290a 100644 --- a/test/external-modules/delayed-aggs/build.gradle +++ b/test/external-modules/delayed-aggs/build.gradle @@ -7,11 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -apply plugin: 'elasticsearch.legacy-yaml-rest-test' - -tasks.named('yamlRestTest').configure { - it.onlyIf("snapshot build") { buildParams.snapshotBuild } -} +apply plugin: 'elasticsearch.internal-yaml-rest-test' esplugin { description = 'A test module that allows to delay aggregations on shards with a configurable time' @@ -23,3 +19,8 @@ restResources { include '_common', 'indices', 'index', 'cluster', 'search' } } + +tasks.named('yamlRestTest') { + def isSnapshot = buildParams.snapshotBuild + it.onlyIf("snapshot build") { isSnapshot } +} diff --git a/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java b/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java index 44ea99a4cbb7d..11981646aeccd 100644 --- a/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java +++ b/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java @@ -12,10 +12,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.junit.ClassRule; public class DelayedShardAggregationClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { + + @ClassRule + public static ElasticsearchCluster cluster = ElasticsearchCluster.local().module("test-delayed-aggs").build(); + public DelayedShardAggregationClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } @@ -24,4 +30,9 @@ public DelayedShardAggregationClientYamlTestSuiteIT(@Name("yaml") ClientYamlTest public static Iterable parameters() throws Exception { return ESClientYamlSuiteTestCase.createParameters(); } + + @Override + protected String getTestRestCluster() { + return cluster.getHttpAddresses(); + } } diff --git a/test/external-modules/error-query/build.gradle b/test/external-modules/error-query/build.gradle index a662422902474..17cf6f4165fe3 100644 --- a/test/external-modules/error-query/build.gradle +++ b/test/external-modules/error-query/build.gradle @@ -7,17 +7,10 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -apply plugin: 'elasticsearch.legacy-yaml-rest-test' -apply plugin: 'elasticsearch.internal-java-rest-test' - -tasks.named('javaRestTest') { - usesDefaultDistribution("to be triaged") - it.onlyIf("snapshot build") { buildParams.snapshotBuild } -} +import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask -tasks.named('yamlRestTest').configure { - it.onlyIf("snapshot build") { buildParams.snapshotBuild } -} +apply plugin: 'elasticsearch.internal-yaml-rest-test' +apply plugin: 'elasticsearch.internal-java-rest-test' esplugin { description = 'A test module that exposes a way to simulate search shard failures and warnings' @@ -29,3 +22,14 @@ restResources { include '_common', 'indices', 'index', 'cluster', 'search' } } + +dependencies { + clusterModules project(':x-pack:plugin:esql') + clusterModules project(':x-pack:plugin:autoscaling') + clusterModules project(':x-pack:plugin:ilm') +} + +tasks.withType(StandaloneRestIntegTestTask) { + def isSnapshot = buildParams.snapshotBuild + onlyIf("snapshot build") { isSnapshot } +} diff --git a/test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java b/test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java index e135dd8d2517c..1a4299b0ce938 100644 --- a/test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java +++ b/test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java @@ -16,7 +16,6 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.test.cluster.ElasticsearchCluster; -import org.elasticsearch.test.cluster.local.distribution.DistributionType; import org.elasticsearch.test.rest.ESRestTestCase; import org.junit.ClassRule; @@ -35,8 +34,9 @@ public class EsqlPartialResultsIT extends ESRestTestCase { @ClassRule public static ElasticsearchCluster cluster = ElasticsearchCluster.local() - .distribution(DistributionType.DEFAULT) .module("test-error-query") + .module("x-pack-esql") + .module("x-pack-ilm") .setting("xpack.security.enabled", "false") .setting("xpack.license.self_generated.type", "trial") .setting("esql.query.allow_partial_results", "true") diff --git a/test/external-modules/error-query/src/yamlRestTest/java/org/elasticsearch/search/query/ErrorQueryClientYamlTestSuiteIT.java b/test/external-modules/error-query/src/yamlRestTest/java/org/elasticsearch/search/query/ErrorQueryClientYamlTestSuiteIT.java index bdcd10600b340..58c4326bf9031 100644 --- a/test/external-modules/error-query/src/yamlRestTest/java/org/elasticsearch/search/query/ErrorQueryClientYamlTestSuiteIT.java +++ b/test/external-modules/error-query/src/yamlRestTest/java/org/elasticsearch/search/query/ErrorQueryClientYamlTestSuiteIT.java @@ -12,10 +12,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.junit.ClassRule; public class ErrorQueryClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { + + @ClassRule + public static ElasticsearchCluster cluster = ElasticsearchCluster.local().module("test-error-query").build(); + public ErrorQueryClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } @@ -24,4 +30,9 @@ public ErrorQueryClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate tes public static Iterable parameters() throws Exception { return ESClientYamlSuiteTestCase.createParameters(); } + + @Override + protected String getTestRestCluster() { + return cluster.getHttpAddresses(); + } } diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalClusterHandle.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalClusterHandle.java index f2e2245e7321e..6620c0f7af401 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalClusterHandle.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultLocalClusterHandle.java @@ -41,7 +41,7 @@ public class DefaultLocalClusterHandle implements LocalClusterHandle { public static final AtomicInteger NEXT_DEBUG_PORT = new AtomicInteger(5007); private static final Logger LOGGER = LogManager.getLogger(DefaultLocalClusterHandle.class); - private static final Duration CLUSTER_UP_TIMEOUT = Duration.ofMinutes(5); + private static final Duration CLUSTER_UP_TIMEOUT = Duration.ofMinutes(1); public final ForkJoinPool executor = new ForkJoinPool( Math.max(Runtime.getRuntime().availableProcessors(), 4), diff --git a/test/yaml-rest-runner/build.gradle b/test/yaml-rest-runner/build.gradle index 37d2a00a68dda..1ae1315ac9ef7 100644 --- a/test/yaml-rest-runner/build.gradle +++ b/test/yaml-rest-runner/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'elasticsearch.build' -apply plugin: 'elasticsearch.legacy-yaml-rest-test' -apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test' +apply plugin: 'elasticsearch.internal-yaml-rest-test' +apply plugin: 'elasticsearch.yaml-rest-compat-test' dependencies { api project(':test:framework') diff --git a/test/yaml-rest-runner/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseFailLogIT.java b/test/yaml-rest-runner/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseFailLogIT.java index abd70d5c3a326..708f3d8e5293c 100644 --- a/test/yaml-rest-runner/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseFailLogIT.java +++ b/test/yaml-rest-runner/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseFailLogIT.java @@ -13,12 +13,17 @@ import org.apache.logging.log4j.Level; import org.elasticsearch.test.MockLog; +import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.junit.annotations.TestLogging; +import org.junit.ClassRule; import java.io.IOException; public class ESClientYamlSuiteTestCaseFailLogIT extends ESClientYamlSuiteTestCase { + @ClassRule + public static ElasticsearchCluster cluster = ElasticsearchCluster.local().build(); + public ESClientYamlSuiteTestCaseFailLogIT(final ClientYamlTestCandidate testCandidate) { super(testCandidate); } @@ -65,4 +70,9 @@ public void test() throws IOException { mockLog.assertAllExpectationsMatched(); } } + + @Override + protected String getTestRestCluster() { + return cluster.getHttpAddresses(); + } }