Skip to content

Commit 4e08e0e

Browse files
authored
Set JAVA13_HOME (elastic#120)
With this commit we set the environment variable JAVA13_HOME so Rally can pick it up in order to compile and run with JDK 13.
1 parent bdd8140 commit 4e08e0e

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

night_rally/fixtures/ansible/Vagrantfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ Vagrant.configure(2) do |config|
293293

294294
# To allow building Elasticsearch (nightlies) install the minimum set of java versions required on target nodes
295295
if node != nodes.first && install_build_requirements
296+
node_config.vm.provision "shell", inline: install_java(13)
296297
node_config.vm.provision "shell", inline: install_java(12)
297298
node_config.vm.provision "shell", inline: symlink_java_8
298299
end

night_rally/fixtures/ansible/roles/rally-update/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
JAVA10_HOME: /var/lib/jenkins/.java/java10
2525
JAVA11_HOME: /var/lib/jenkins/.java/openjdk11
2626
JAVA12_HOME: /var/lib/jenkins/.java/openjdk12
27+
JAVA13_HOME: /var/lib/jenkins/.java/openjdk13
2728
become: true
2829
become_user: jenkins
2930
when: not in_vagrant | default("false") | bool
@@ -36,6 +37,7 @@
3637
JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
3738
JAVA11_HOME: /var/lib/jenkins/.java/openjdk11
3839
JAVA12_HOME: /var/lib/jenkins/.java/openjdk12
40+
JAVA13_HOME: /var/lib/jenkins/.java/openjdk13
3941
become: true
4042
become_user: jenkins
4143
when: in_vagrant | default("false") | bool

0 commit comments

Comments
 (0)