Skip to content

Commit 38ee3b0

Browse files
Merge branch 'main' into per-project-s3-clients
2 parents 4048064 + df43f83 commit 38ee3b0

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public abstract class RunTask extends DefaultTestClustersTask {
4646

4747
private Boolean apmServerEnabled = false;
4848

49-
private List<String> plugins = List.of();
49+
private List<String> plugins;
5050

5151
private Boolean preserveData = false;
5252

@@ -115,7 +115,12 @@ public void setPlugins(String plugins) {
115115
}
116116
}
117117

118+
public void setPlugins(List<String> plugins) {
119+
this.plugins = plugins;
120+
}
121+
118122
@Input
123+
@Optional
119124
public List<String> getPlugins() {
120125
return plugins;
121126
}

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,9 @@ tests:
486486
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
487487
method: testFailToStartRequestOnRemoteCluster
488488
issue: https://github.com/elastic/elasticsearch/issues/128545
489+
- class: org.elasticsearch.packaging.test.DockerTests
490+
method: test124CanRestartContainerWithStackLoggingConfig
491+
issue: https://github.com/elastic/elasticsearch/issues/128121
489492

490493
# Examples:
491494
#

0 commit comments

Comments
 (0)