diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy index ab78ee00eeba8..a443df0c458da 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy +++ b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy @@ -73,9 +73,6 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest { // avoids a dependency problem in this test, the distribution in use here is inconsequential to the test import org.elasticsearch.gradle.testclusters.TestDistribution; - testClusters { - yamlRestCompatTest.setTestDistribution(TestDistribution.INTEG_TEST) - } dependencies { yamlRestTestImplementation "junit:junit:4.12" @@ -198,10 +195,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest { // avoids a dependency problem in this test, the distribution in use here is inconsequential to the test import org.elasticsearch.gradle.testclusters.TestDistribution; - testClusters { - yamlRestCompatTest.setTestDistribution(TestDistribution.INTEG_TEST) - } - + dependencies { yamlRestTestImplementation "junit:junit:4.12" } diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java index 9c89cf0f86985..bb95fdf6aa520 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java @@ -19,9 +19,7 @@ import org.elasticsearch.gradle.test.rest.RestResourcesPlugin; import org.elasticsearch.gradle.test.rest.RestTestUtil; import org.elasticsearch.gradle.test.rest.YamlRestTestPlugin; -import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; -import org.elasticsearch.gradle.testclusters.TestDistribution; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.Plugin; import org.gradle.api.Project; @@ -39,7 +37,6 @@ import java.nio.file.Path; import java.util.Map; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.createTestCluster; import static org.elasticsearch.gradle.test.rest.RestTestUtil.setupDependencies; /** @@ -75,10 +72,6 @@ public void apply(Project project) { SourceSet yamlTestSourceSet = sourceSets.getByName(YamlRestTestPlugin.SOURCE_SET_NAME); GradleUtils.extendSourceSet(project, YamlRestTestPlugin.SOURCE_SET_NAME, SOURCE_SET_NAME); - // create the test cluster container, and always use the default distribution - ElasticsearchCluster testCluster = createTestCluster(project, yamlCompatTestSourceSet); - testCluster.setTestDistribution(TestDistribution.DEFAULT); - // copy compatible rest specs Configuration bwcMinorConfig = project.getConfigurations().create("bwcMinor"); Dependency bwcMinor = project.getDependencies().project(Map.of("path", ":distribution:bwc:minor", "configuration", "checkout"));