From e6009b5e74e3efedef937fa54d675f4ab30150b4 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 5 Mar 2019 22:09:47 -0800 Subject: [PATCH] Make integ tests always use runtime java This commit ensures cluster formation always uses runtime java, never attempting to use the bundled jdk, since the integ test zip does not contain it. --- .../elasticsearch/gradle/test/ClusterFormationTasks.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy index 99374d06c172f..3ac7243d13b79 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy @@ -642,7 +642,8 @@ class ClusterFormationTasks { return project.tasks.create(name: name, type: LoggedExec, dependsOn: setup) { Exec exec -> exec.workingDir node.cwd // TODO: this must change to 7.0.0 after bundling java has been backported - if (project.isRuntimeJavaHomeSet || node.nodeVersion.before(Version.fromString("8.0.0"))) { + if (project.isRuntimeJavaHomeSet || node.nodeVersion.before(Version.fromString("8.0.0")) || + node.config.distribution == 'integ-test-zip') { exec.environment.put('JAVA_HOME', project.runtimeJavaHome) } else { // force JAVA_HOME to *not* be set @@ -667,7 +668,8 @@ class ClusterFormationTasks { ant.exec(executable: node.executable, spawn: node.config.daemonize, newenvironment: true, dir: node.cwd, taskname: 'elasticsearch') { node.env.each { key, value -> env(key: key, value: value) } - if (project.isRuntimeJavaHomeSet || node.nodeVersion.before(Version.fromString("8.0.0"))) { + if (project.isRuntimeJavaHomeSet || node.nodeVersion.before(Version.fromString("8.0.0")) || + node.config.distribution == 'integ-test-zip') { env(key: 'JAVA_HOME', value: project.runtimeJavaHome) } node.args.each { arg(value: it) }