@@ -575,22 +575,35 @@ function hadoopcheck_rebuild
575575
576576 # All supported Hadoop versions that we want to test the compilation with
577577 # See the Hadoop section on prereqs in the HBase Reference Guide
578- if [[ " ${PATCH_BRANCH} " = branch-2.* ]]; then
579- yetus_info " Setting Hadoop 2 versions to test based on branch-2.4+ rules."
578+ if [[ " ${PATCH_BRANCH} " = branch-2.4 ]]; then
579+ yetus_info " Setting Hadoop 2 versions to test based on branch-2.4 rules."
580580 if [[ " ${QUICK_HADOOPCHECK} " == " true" ]]; then
581- hbase_hadoop2_versions=" 2.10.1 "
581+ hbase_hadoop2_versions=" 2.10.2 "
582582 else
583- hbase_hadoop2_versions=" 2.10.0 2.10.1"
583+ hbase_hadoop2_versions=" 2.10.0 2.10.1 2.10.2 "
584584 fi
585+ elif [[ " ${PATCH_BRANCH} " = branch-2.* ]]; then
586+ yetus_info " Setting Hadoop 2 versions to test based on branch-2.5+ rules."
587+ hbase_hadoop2_versions=" 2.10.2"
585588 else
586589 yetus_info " Setting Hadoop 2 versions to null on master/feature branch rules since we do not support hadoop 2 for hbase 3.x any more."
587590 hbase_hadoop2_versions=" "
588591 fi
589- yetus_info " Setting Hadoop 3 versions to test based on branch-2.4+/master/feature branch rules"
590- if [[ " ${QUICK_HADOOPCHECK} " == " true" ]]; then
591- hbase_hadoop3_versions=" 3.1.2 3.2.2 3.3.1"
592+
593+ if [[ " ${PATCH_BRANCH} " = branch-2.4 ]]; then
594+ yetus_info " Setting Hadoop 3 versions to test based on branch-2.4 rules"
595+ if [[ " ${QUICK_HADOOPCHECK} " == " true" ]]; then
596+ hbase_hadoop3_versions=" 3.1.4 3.2.4 3.3.4"
597+ else
598+ hbase_hadoop3_versions=" 3.1.1 3.1.2 3.1.3 3.1.4 3.2.0 3.2.1 3.2.2 3.2.3 3.2.4 3.3.0 3.3.1 3.3.2 3.3.3 3.3.4"
599+ fi
592600 else
593- hbase_hadoop3_versions=" 3.1.1 3.1.2 3.2.0 3.2.1 3.2.2 3.3.0 3.3.1"
601+ yetus_info " Setting Hadoop 3 versions to test based on branch-2.5+/master/feature branch rules"
602+ if [[ " ${QUICK_HADOOPCHECK} " == " true" ]]; then
603+ hbase_hadoop3_versions=" 3.2.4 3.3.4"
604+ else
605+ hbase_hadoop3_versions=" 3.2.3 3.2.4 3.3.2 3.3.3 3.3.4"
606+ fi
594607 fi
595608
596609 export MAVEN_OPTS=" ${MAVEN_OPTS} "
0 commit comments