Skip to content

Add --with-plugins to run task #125468

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 3 commits into from
Mar 24, 2025
Merged

Add --with-plugins to run task #125468

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46ca00b
Add --with-plugins to run task
rjernst Mar 23, 2025
07d135b
Merge branch 'main' into build/run_with_plugins
rjernst Mar 24, 2025
2d80d68
cleanup
rjernst Mar 24, 2025
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
19 changes: 19 additions & 0 deletions build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand All @@ -45,6 +46,8 @@ public abstract class RunTask extends DefaultTestClustersTask {

private Boolean apmServerEnabled = false;

private List<String> plugins = List.of();

private Boolean preserveData = false;

private Path dataDir = null;
Expand Down Expand Up @@ -101,6 +104,22 @@ public void setApmServerEnabled(Boolean apmServerEnabled) {
this.apmServerEnabled = apmServerEnabled;
}

@Option(option = "with-plugins", description = "Run distribution with plugins installed")
public void setPlugins(String plugins) {
this.plugins = Arrays.asList(plugins.split(","));
for (var cluster : getClusters()) {
for (String plugin : this.plugins) {
cluster.plugin(":plugins:" + plugin);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plain FYI. I noticed this is incompatible with Gradle Configuration cache. that's likely not a big deal for using ./gradlew run at the moment, but we will rework or remove cluster.plugin(String) and cluster.module(String) at one point as it breaks configuration compatibility.

}
dependsOn(cluster.getPluginAndModuleConfigurations());
}
}

@Input
public List<String> getPlugins() {
return plugins;
}

@Option(option = "data-dir", description = "Override the base data directory used by the testcluster")
public void setDataDir(String dataDirStr) {
dataDir = Paths.get(dataDirStr).toAbsolutePath();
Expand Down