From bc90224475fb0d17097ce89710c76c8e4bd5180e Mon Sep 17 00:00:00 2001 From: zhangduo Date: Fri, 31 May 2019 21:55:40 +0800 Subject: [PATCH] HBASE-22506 Backport HBASE-22500 'Modify pom and jenkins jobs for hadoop versions' to branch-1 --- dev-support/hbase-personality.sh | 18 ++++++++++++++++-- pom.xml | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index c8db12f8ea..9ec15ab249 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -514,12 +514,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 - hbase_hadoop3_versions="3.0.0" if [[ "${PATCH_BRANCH}" = branch-1* ]]; then + yetus_info "Setting Hadoop 3 versions to test based on branch-1.x rules." hbase_hadoop3_versions="" + 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}" diff --git a/pom.xml b/pom.xml index 4f5512ebe8..8fb45189be 100644 --- a/pom.xml +++ b/pom.xml @@ -1252,7 +1252,7 @@ 2.8.5 ${hadoop-two.version} - 3.0.0 + 3.1.2 -- 2.17.1