github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Clear JAVA_HOME to use bundled JDK for Elasticsearch

Browse source 
This commit clears the `JAVA_HOME` variable when starting Elasticsearch
to force it to use the bundled version of the JDK, rather than the
default `JAVA_HOME` from the machine Logstash integration tests are being
run on, and removes the likelihood of tests failing to run due to `JAVA_HOME`
being set to a non-compliant JDK.
This commit is contained in:
Rob Bavey 2020-07-06 16:45:37 -04:00 • committed by Robert Bavey
parent 85a572a077
commit 40f99249e6
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qa/integration/services/elasticsearch_setup.sh
View file

@ -8,7 +8,7 @@ ES_HOME="$current_dir/../../../build/elasticsearch"
start_es() { start_es() {
es_args=$@ es_args=$@
$ES_HOME/bin/elasticsearch -Epath.data=/tmp/ls_integration/es-data -Epath.logs=/tmp/ls_integration/es-logs $es_args -p $ES_HOME/elasticsearch.pid > /tmp/elasticsearch.log 2>/dev/null & JAVA_HOME= $ES_HOME/bin/elasticsearch -Epath.data=/tmp/ls_integration/es-data -Epath.logs=/tmp/ls_integration/es-logs $es_args -p $ES_HOME/elasticsearch.pid > /tmp/elasticsearch.log 2>/dev/null &
count=120 count=120
echo "Waiting for elasticsearch to respond..." echo "Waiting for elasticsearch to respond..."
while ! curl --silent localhost:9200 && [[ $count -ne 0 ]]; do while ! curl --silent localhost:9200 && [[ $count -ne 0 ]]; do