You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/01/11 01:43:44 UTC
[hbase] branch branch-2.2 updated: HBASE-25485 Nightly build uses
JDK11 for branch-2.2 (#2863)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 1c685c0 HBASE-25485 Nightly build uses JDK11 for branch-2.2 (#2863)
1c685c0 is described below
commit 1c685c06fdc01a72ac33945547690702d2f9de10
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Mon Jan 11 02:43:02 2021 +0100
HBASE-25485 Nightly build uses JDK11 for branch-2.2 (#2863)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
dev-support/Jenkinsfile | 6 +++---
dev-support/Jenkinsfile_GitHub | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 4d72878..17e3b85 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -197,7 +197,7 @@ pipeline {
TESTS = 'all,-unit,-findbugs'
// on branches that don't support jdk7, this will already be JAVA_HOME, so we'll end up not
// doing multijdk there.
- MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
+ MULTIJDK = '/usr/local/openjdk-8'
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_GENERAL}"
}
@@ -347,7 +347,7 @@ pipeline {
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_HADOOP2}"
// 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
- SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
+ SET_JAVA_HOME = '/usr/local/openjdk-8'
}
steps {
// Must do prior to anything else, since if one of them timesout we'll stash the commentfile
@@ -432,7 +432,7 @@ pipeline {
OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE_HADOOP3}"
// 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
- SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
+ SET_JAVA_HOME = '/usr/local/openjdk-8'
// Activates hadoop 3.0 profile in maven runs.
HADOOP_PROFILE = '3.0'
}
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 6eab659..0152b64 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -152,7 +152,7 @@ pipeline {
YETUS_ARGS+=("--docker")
YETUS_ARGS+=("--dockerfile=${DOCKERFILE}")
YETUS_ARGS+=("--mvn-custom-repos")
- YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-8-openjdk-amd64")
+ YETUS_ARGS+=("--multijdkdirs=/usr/local/openjdk-8")
YETUS_ARGS+=("--findbugs-home=/usr")
YETUS_ARGS+=("--whitespace-eol-ignore-list=.*/generated/.*")
YETUS_ARGS+=("--whitespace-tabs-ignore-list=.*/generated/.*")