habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always use jdk8 on jenkins

Browse Source
This commit is contained in:
spalger
2016-02-20 16:02:25 -08:00
parent 64c3e13f60
commit 3316d4e9fd
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ci.js
View File

@ -48,10 +48,6 @@ 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;

3
scripts/jenkins.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash
export JAVA_HOME="/usr/lib/jvm/jdk8"
lockpath="/var/lock/setup_nodejs"
# pass a file name to aquire a lock
@ -64,4 +65,4 @@ install_node "$NODE_V"
npm install
release_lock
ES_PATH_REPO="./.es-snapshot-repos/$EXECUTOR_NUMBER/" ES_PORT=$((9400 + EXECUTOR_NUMBER)) RUN=NODE_UNIT,NODE_INTEGRATION VERBOSE=true node ./scripts/ci.js
ES_PATH_REPO="./.es-snapshot-repos/$EXECUTOR_NUMBER/" ES_PORT=$((9400 + EXECUTOR_NUMBER)) RUN=NODE_UNIT,NODE_INTEGRATION VERBOSE=true node ./scripts/ci.js