From 789c7aefca2d91e6dd1a93f021e4f1de31041ca4 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Fri, 20 Mar 2020 14:18:07 +0800 Subject: [PATCH] HBASE-24009 Backport the personality changes in HBASE-23989 to all active branches (#1304) Signed-off-by: stack Signed-off-by: Jan Hentschel --- dev-support/hbase-personality.sh | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index c183cfb5465..95abae8f4ae 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -531,8 +531,8 @@ function hadoopcheck_rebuild # All supported Hadoop versions that we want to test the compilation with # See the Hadoop section on prereqs in the HBase Reference Guide - if [[ "${PATCH_BRANCH}" = branch-1.* ]] && [[ "${PATCH_BRANCH#branch-1.}" -lt "4" ]]; then - yetus_info "Setting Hadoop 2 versions to test based on before-branch-1.4 rules." + if [[ "${PATCH_BRANCH}" = branch-1.3 ]]; then + yetus_info "Setting Hadoop 2 versions to test based on branch-1.3 rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then hbase_hadoop2_versions="2.4.1 2.5.2 2.6.5 2.7.7" else @@ -545,6 +545,13 @@ function hadoopcheck_rebuild else hbase_hadoop2_versions="2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7" fi + elif [[ "${PATCH_BRANCH}" = branch-1 ]]; then + yetus_info "Setting Hadoop 2 versions to test based on branch-1 rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.8.5 2.9.2" + else + hbase_hadoop2_versions="2.8.5 2.9.2" + fi elif [[ "${PATCH_BRANCH}" = branch-2.0 ]]; then yetus_info "Setting Hadoop 2 versions to test based on branch-2.0 rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then @@ -559,12 +566,19 @@ function hadoopcheck_rebuild else hbase_hadoop2_versions="2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7 2.8.2 2.8.3 2.8.4 2.8.5" fi - else - yetus_info "Setting Hadoop 2 versions to test based on branch-1.5+/branch-2.2+/master/feature branch rules." + elif [[ "${PATCH_BRANCH}" = branch-2.2 ]]; then + yetus_info "Setting Hadoop 2 versions to test based on branch-2.2 rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then - hbase_hadoop2_versions="2.8.5 2.9.2" + hbase_hadoop2_versions="2.8.5 2.9.2 2.10.0" else - hbase_hadoop2_versions="2.8.5 2.9.2" + hbase_hadoop2_versions="2.8.5 2.9.2 2.10.0" + fi + else + yetus_info "Setting Hadoop 2 versions to test based on branch-2.3+/master/feature branch rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.10.0" + else + hbase_hadoop2_versions="2.10.0" fi fi if [[ "${PATCH_BRANCH}" = branch-1* ]]; then