From 142fe1e45235a05842a93feec6946e464c89f360 Mon Sep 17 00:00:00 2001 From: spalger Date: Sat, 20 Feb 2016 13:15:08 -0800 Subject: [PATCH] use jdk8 on jenkins --- scripts/ci.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/ci.js b/scripts/ci.js index 9403784c2..28e6e6a47 100644 --- a/scripts/ci.js +++ b/scripts/ci.js @@ -48,6 +48,10 @@ task('NODE_UNIT', true, function () { task('NODE_INTEGRATION', true, function () { var branch = ENV.ES_REF; + if (branch === 'master' || branch.match(/^[3-9]/)) { + process.env.JAVA_HOME = '/usr/lib/jvm/jdk8'; + } + return node('scripts/generate', '--no-api', '--branch', branch) .then(function () { var target = (JENKINS ? 'jenkins_' : '') + 'integration:' + branch;