Skip to content

[9.0] Try fixing mutedTest.yml file not found (#125763) #125771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2025
Merged

[9.0] Try fixing mutedTest.yml file not found (#125763) #125771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -26,21 +27,22 @@ public class MutedTestPlugin implements Plugin<Project> {

@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<RegularFile> 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<MutedTestsBuildService> 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);
});

Expand Down
2 changes: 1 addition & 1 deletion test/external-modules/error-query/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}