Skip to content

Commit d759de7

Browse files
committed
Try fixing mutedTest.yml file not found
Avoid eager task creation introduced lately that seems to trigger some wrong behaviour here. Also use newer api for resolving root project
1 parent 9dd0228 commit d759de7

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.gradle.api.provider.Provider;
1717
import org.gradle.api.tasks.testing.Test;
1818

19+
import java.io.File;
1920
import java.util.Arrays;
2021
import java.util.List;
2122

@@ -26,6 +27,10 @@ public class MutedTestPlugin implements Plugin<Project> {
2627

2728
@Override
2829
public void apply(Project project) {
30+
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
31+
var buildParams = loadBuildParams(project).get();
32+
33+
File settingsRoot = project.getLayout().getSettingsDirectory().getAsFile();
2934
String additionalFilePaths = project.hasProperty(ADDITIONAL_FILES_PROPERTY)
3035
? project.property(ADDITIONAL_FILES_PROPERTY).toString()
3136
: "";
@@ -34,13 +39,10 @@ public void apply(Project project) {
3439
.map(p -> project.getRootProject().getLayout().getProjectDirectory().file(p))
3540
.toList();
3641

37-
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
38-
var buildParams = loadBuildParams(project).get();
39-
4042
Provider<MutedTestsBuildService> mutedTestsProvider = project.getGradle()
4143
.getSharedServices()
4244
.registerIfAbsent("mutedTests", MutedTestsBuildService.class, spec -> {
43-
spec.getParameters().getInfoPath().set(project.getRootProject().getProjectDir());
45+
spec.getParameters().getInfoPath().set(settingsRoot);
4446
spec.getParameters().getAdditionalFiles().set(additionalFiles);
4547
});
4648

test/external-modules/error-query/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
clusterModules project(':x-pack:plugin:ilm')
3030
}
3131

32-
tasks.withType(StandaloneRestIntegTestTask) {
32+
tasks.withType(StandaloneRestIntegTestTask).configureEach {
3333
def isSnapshot = buildParams.snapshotBuild
3434
onlyIf("snapshot build") { isSnapshot }
3535
}

0 commit comments

Comments
 (0)