More fixes

mark-vieira · Sep 4, 2024 · 29fc839 · 29fc839
1 parent 997de87
commit 29fc839
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...asticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java b/...asticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java
@@ -35,6 +35,7 @@
 import org.gradle.api.tasks.Sync;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.testing.Test;
+import org.gradle.language.jvm.tasks.ProcessResources;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -213,6 +214,16 @@ public void apply(Project project) {
             .named(RestResourcesPlugin.COPY_YAML_TESTS_TASK)
             .flatMap(CopyRestTestsTask::getOutputResourceDir);
 
+        // ensure we include other non rest spec related test resources
+        project.getTasks()
+            .withType(ProcessResources.class)
+            .named(yamlCompatTestSourceSet.getProcessResourcesTaskName())
+            .configure(processResources -> {
+                processResources.from(sourceSets.getByName(YamlRestTestPlugin.YAML_REST_TEST).getResources(), spec -> {
+                    spec.exclude("rest-api-spec/**");
+                });
+            });
+
         // setup the test task
         TaskProvider<? extends Test> yamlRestCompatTestTask = registerTestTask(project, yamlCompatTestSourceSet);
         yamlRestCompatTestTask.configure(testTask -> {
@@ -225,7 +236,7 @@ public void apply(Project project) {
             testTask.setClasspath(
                 yamlCompatTestSourceSet.getRuntimeClasspath()
                     // remove the "normal" api and tests
-                    .minus(project.files(new File(yamlTestSourceSet.getOutput().getResourcesDir(), "rest-api-spec")))
+                    .minus(project.files(yamlTestSourceSet.getOutput().getResourcesDir()))
                     .minus(project.files(originalYamlSpecsDir))
                     .minus(project.files(originalYamlTestsDir))
             );

diff --git a/modules/data-streams/build.gradle b/modules/data-streams/build.gradle
@@ -1,4 +1,5 @@
 import org.elasticsearch.gradle.internal.info.BuildParams
+import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 apply plugin: 'elasticsearch.test-with-dependencies'
 apply plugin: 'elasticsearch.internal-cluster-test'
@@ -23,11 +24,7 @@ dependencies {
   internalClusterTestImplementation project(":modules:mapper-extras")
 }
 
-tasks.named('yamlRestTest') {
-  usesDefaultDistribution()
-}
-
-tasks.named('javaRestTest') {
+tasks.withType(StandaloneRestIntegTestTask).configureEach {
   usesDefaultDistribution()
 }