From 25ffdfd136a750437ab44f0a5a6578ff3d2196aa Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Tue, 8 Nov 2022 22:41:05 +0800 Subject: [PATCH 1/2] HBASE-27472 The personality script set wrong hadoop2 check version for branch-2 --- dev-support/hbase-personality.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 5f18b4652afc..a3a165deda78 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -582,7 +582,7 @@ function hadoopcheck_rebuild else hbase_hadoop2_versions="2.10.0 2.10.1 2.10.2" fi - elif [[ "${PATCH_BRANCH}" = branch-2.* ]]; then + elif [[ "${PATCH_BRANCH}" = branch-2.* ]] || [[ "${PATCH_BRANCH}" == branch-2 ]]; then yetus_info "Setting Hadoop 2 versions to test based on branch-2.5+ rules." hbase_hadoop2_versions="2.10.2" else From c7cd14e0d1ae79ae870dcca77585ca4d2e3e76d2 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Thu, 10 Nov 2022 12:02:27 +0800 Subject: [PATCH 2/2] simplify the conditon check --- dev-support/hbase-personality.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index a3a165deda78..efe84345f066 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -582,7 +582,7 @@ function hadoopcheck_rebuild else hbase_hadoop2_versions="2.10.0 2.10.1 2.10.2" fi - elif [[ "${PATCH_BRANCH}" = branch-2.* ]] || [[ "${PATCH_BRANCH}" == branch-2 ]]; then + elif [[ "${PATCH_BRANCH}" = branch-2* ]]; then yetus_info "Setting Hadoop 2 versions to test based on branch-2.5+ rules." hbase_hadoop2_versions="2.10.2" else