Merge pull request #6594 from spalger/pr/6587

Bump 4.5+ to es 2.3
elastic · Mar 22, 2016 · 86875af · 86875af
2 parents 7ec9b6a + 1085100
commit 86875af
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -151,7 +151,7 @@
     "grunt-cli": "0.1.13",
     "grunt-contrib-clean": "0.6.0",
     "grunt-contrib-copy": "0.8.1",
-    "grunt-esvm": "1.1.8",
+    "grunt-esvm": "3.0.4",
     "grunt-karma": "0.12.0",
     "grunt-run": "0.5.0",
     "grunt-s3": "0.2.0-alpha.3",

diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
@@ -6,7 +6,7 @@ module.exports = function (grunt) {
 
   return {
     options: {
-      branch: '2.x',
+      branch: '2.3',
       fresh: !grunt.option('esvm-no-fresh'),
       config: {
         network: {

diff --git a/tasks/jenkins.js b/tasks/jenkins.js
@@ -1,8 +1,20 @@
-module.exports = function (grunt) {
-  let { compact } = require('lodash');
+import { compact } from 'lodash';
+import { delimiter } from 'path';
 
+module.exports = function (grunt) {
   grunt.registerTask('jenkins', 'Jenkins build script', function () {
+    // make sure JAVA_HOME points to JDK8
+    const HOME = '/usr/lib/jvm/jdk8';
+    process.env.JAVA_HOME = HOME;
+
+    // extend PATH to point to JDK8
+    const path = process.env.PATH.split(delimiter);
+    path.unshift(`${HOME}/bin`);
+    process.env.PATH = path.join(delimiter);
+
+    // always build os packages on jenkins
     grunt.option('os-packages', true);
+
     grunt.task.run(compact([
       'test',
       process.env.JOB_NAME === 'kibana_core' ? 'build' : null