From d6682adebe46ccd5763576f0413c8fc6e6ee7d12 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Fri, 31 May 2019 21:57:46 +0800 Subject: [PATCH] HBASE-22507 Backport the pre commit changes in HBASE-22500 to all active branches --- dev-support/hbase-personality.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index d5f0177bc0..94f03ce194 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -529,19 +529,26 @@ function hadoopcheck_rebuild if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then hbase_hadoop2_versions="2.8.5 2.9.2" else - hbase_hadoop2_versions="2.8.2 2.8.3 2.8.4 2.8.5 2.9.1 2.9.2" + hbase_hadoop2_versions="2.8.5 2.9.2" fi fi if [[ "${PATCH_BRANCH}" = branch-1* ]]; then yetus_info "Setting Hadoop 3 versions to test based on branch-1.x rules." hbase_hadoop3_versions="" - else - yetus_info "Setting Hadoop 3 versions to test based on branch-2.x/master/feature branch rules" + elif [[ "${PATCH_BRANCH}" = branch-2.0 ]] || [[ "${PATCH_BRANCH}" = branch-2.1 ]]; then + yetus_info "Setting Hadoop 3 versions to test based on branch-2.0/branch-2.1 rules" if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then hbase_hadoop3_versions="3.0.3 3.1.2" else hbase_hadoop3_versions="3.0.3 3.1.1 3.1.2" fi + else + yetus_info "Setting Hadoop 3 versions to test based on branch-2.2+/master/feature branch rules" + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop3_versions="3.1.2" + else + hbase_hadoop3_versions="3.1.1 3.1.2" + fi fi export MAVEN_OPTS="${MAVEN_OPTS}" -- 2.17.1