HBASE-19066 Correct the directory of openjdk-8 for jenkins

Signed-off-by: Sean Busbey <busbey@apache.org>
This commit is contained in:
Chia-Ping Tsai 2017-10-23 03:49:07 +08:00 committed by Sean Busbey
parent 2a28ff840e
commit bd98620c4f
1 changed files with 2 additions and 2 deletions

View File

@ -121,7 +121,7 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
TESTS = 'all,-unit,-findbugs' TESTS = 'all,-unit,-findbugs'
// on branches that don't support jdk7, this will already be JAVA_HOME, so we'll end up not // on branches that don't support jdk7, this will already be JAVA_HOME, so we'll end up not
// doing multijdk there. // doing multijdk there.
MULTIJDK = '/usr/lib/jvm/java-8-oracle' MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}" OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}" OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
} }
@ -211,7 +211,7 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
OUTPUTDIR = "${env.OUTPUTDIR_JDK8}" OUTPUTDIR = "${env.OUTPUTDIR_JDK8}"
// This isn't strictly needed on branches that only support jdk8, but doesn't hurt // This isn't strictly needed on branches that only support jdk8, but doesn't hurt
// and is needed on branches that do both jdk7 and jdk8 // and is needed on branches that do both jdk7 and jdk8
SET_JAVA_HOME = '/usr/lib/jvm/java-8-oracle' SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
} }
steps { steps {
unstash 'yetus' unstash 'yetus'