Skip to content

Commit d69f8dc

Browse files
authored
Install Java 11 always
Currently we install add-on Java versions (11/12/...) only for nightly benchmarks in Vagrant. However, https://github.com/elastic/night-rally/blob/07cdb01e6eabdec50b7d76bf23fade42111e3acb/night_rally.sh#L52 sets Java 11 as default so it's needed for release benchmarks too. This commit installs Java 11 always on Vagrant machines. Closes elastic#114
1 parent 0e358bd commit d69f8dc

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

night_rally/fixtures/ansible/Vagrantfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,15 @@ Vagrant.configure(2) do |config|
258258

259259
node_config.vm.provision "shell", inline: install_night_rally_test_script(base_ip, target_node_ip_addresses)
260260

261+
# Java 11 is used by default for release benchmarks, so should be installed always
262+
# https://github.com/elastic/night-rally/issues/114#issuecomment-534100792
263+
if node != nodes.first
264+
node_config.vm.provision "shell", inline: install_java(11)
265+
end
266+
261267
# To allow building Elasticsearch (nightlies) install the minimum set of java versions required on target nodes
262268
if node != nodes.first && install_build_requirements
263269
node_config.vm.provision "shell", inline: install_java(12)
264-
node_config.vm.provision "shell", inline: install_java(11)
265270
node_config.vm.provision "shell", inline: symlink_java_8
266271
end
267272

0 commit comments

Comments
 (0)