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 2020/04/17 03:59:02 UTC
[hbase] 01/01: HBASE-24198 Make nightly job run hadoop3 check on
JDK8
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-24198
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 2a3d157a134d952d2b78a398771243a245c6b093
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Apr 17 11:43:24 2020 +0800
HBASE-24198 Make nightly job run hadoop3 check on JDK8
---
dev-support/Jenkinsfile | 10 ++++++++++
dev-support/hbase_nightly_yetus.sh | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 5994bbb..f5c0293 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -120,6 +120,11 @@ pipeline {
}
}
stage ('hadoop 2 cache') {
+ when {
+ not {
+ branch 'master'
+ }
+ }
environment {
HADOOP2_VERSION="2.10.0"
}
@@ -341,6 +346,11 @@ pipeline {
label 'Hadoop'
}
}
+ when {
+ not {
+ branch 'master'
+ }
+ }
environment {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.DEEP_CHECKS}"
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index ef91f20..9fa7b55 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -76,7 +76,7 @@ fi
# For testing with specific hadoop version. Activates corresponding profile in maven runs.
if [[ -n "${HADOOP_PROFILE}" ]]; then
- YETUS_ARGS=("--hadoop-profile=${HADOOP_PROFILE}" "${YETUS_ARGS[@]}")
+ YETUS_ARGS=("-Phadoop-${HADOOP_PROFILE}" "${YETUS_ARGS[@]}")
fi
if [[ -n "${SKIP_ERROR_PRONE}" ]]; then