github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-27 17:10:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add optional pull request check for running with entitlements enabled (#118693)

Browse source
This commit is contained in:
Mark Vieira 2024-12-13 13:13:44 -08:00 • committed by GitHub
parent 0a6ce27825
commit e454d74de4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 57 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
View file

@ -876,10 +876,8 @@ public class ElasticsearchNode implements TestClusterConfiguration {
// Don't inherit anything from the environment for as that would lack reproducibility
environment.clear();
environment.putAll(getESEnvironment());
if (cliJvmArgs.isEmpty() == false) {
String cliJvmArgsString = String.join(" ", cliJvmArgs);
environment.put("CLI_JAVA_OPTS", cliJvmArgsString);
}
String cliJvmArgsString = String.join(" ", cliJvmArgs);
environment.put("CLI_JAVA_OPTS", cliJvmArgsString + " " + System.getProperty("tests.jvm.argline", ""));
// Direct the stderr to the ES log file. This should capture any jvm problems to start.
// Stdout is discarded because ES duplicates the log file to stdout when run in the foreground.