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 06:38:38 UTC
[hbase] 01/01: HBASE-24198 Skip hadoop2 check for master branch
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 d2a41925f9043f85fbd7d1f7f382ccc4197b115d
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Apr 17 14:35:47 2020 +0800
HBASE-24198 Skip hadoop2 check for master branch
---
dev-support/Jenkinsfile | 3 +++
dev-support/hbase_nightly_yetus.sh | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 5994bbb..8a8b358 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -341,6 +341,9 @@ pipeline {
label 'Hadoop'
}
}
+ when {
+ anyOf { branch 'branch-1*'; branch 'branch-2*' }
+ }
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