diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java index ea6e8f0f1b01e..05b0a413e5ebb 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java @@ -16,6 +16,7 @@ import org.gradle.api.provider.Provider; import org.gradle.api.tasks.testing.Test; +import java.io.File; import java.util.Arrays; import java.util.List; @@ -26,21 +27,22 @@ public class MutedTestPlugin implements Plugin { @Override public void apply(Project project) { + project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class); + var buildParams = loadBuildParams(project).get(); + + File settingsRoot = project.getLayout().getSettingsDirectory().getAsFile(); String additionalFilePaths = project.hasProperty(ADDITIONAL_FILES_PROPERTY) ? project.property(ADDITIONAL_FILES_PROPERTY).toString() : ""; List additionalFiles = Arrays.stream(additionalFilePaths.split(",")) .filter(p -> p.isEmpty() == false) - .map(p -> project.getRootProject().getLayout().getProjectDirectory().file(p)) + .map(p -> project.getLayout().getSettingsDirectory().file(p)) .toList(); - project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class); - var buildParams = loadBuildParams(project).get(); - Provider mutedTestsProvider = project.getGradle() .getSharedServices() .registerIfAbsent("mutedTests", MutedTestsBuildService.class, spec -> { - spec.getParameters().getInfoPath().set(project.getRootProject().getProjectDir()); + spec.getParameters().getInfoPath().set(settingsRoot); spec.getParameters().getAdditionalFiles().set(additionalFiles); }); diff --git a/test/external-modules/error-query/build.gradle b/test/external-modules/error-query/build.gradle index 17cf6f4165fe3..6e30c93502a76 100644 --- a/test/external-modules/error-query/build.gradle +++ b/test/external-modules/error-query/build.gradle @@ -29,7 +29,7 @@ dependencies { clusterModules project(':x-pack:plugin:ilm') } -tasks.withType(StandaloneRestIntegTestTask) { +tasks.withType(StandaloneRestIntegTestTask).configureEach { def isSnapshot = buildParams.snapshotBuild onlyIf("snapshot build") { isSnapshot } }