[hbase] branch HBASE-25853 updated: HBASE-26176 Correct regex in hbase-personality.sh (#3568)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

taklwu pushed a commit to branch HBASE-25853
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/HBASE-25853 by this push:
     new 1a30692  HBASE-26176 Correct regex in hbase-personality.sh (#3568)
1a30692 is described below

commit 1a306924a40724521a8d5eb44289f170cc259bc8
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Mon Aug 9 17:37:15 2021 +0200

    HBASE-26176 Correct regex in hbase-personality.sh (#3568)
    
    This is a rework of the original commit to enable
    Hadoop 3 profile for the HBASE-25853 branch.
    
    Signed-off-by: Tak Lon (Stephen) Wu <ta...@apache.org>
---
 dev-support/hbase-personality.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index e8e66b9..a198069 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -148,7 +148,8 @@ function personality_modules
   # If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
   # the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
   # logic is not both activated within Maven.
-  if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" =~ branch-2* ]] ; then
+  if [[ -n "${HADOOP_PROFILE}" ]] \
+     && { [[ "${PATCH_BRANCH}" = branch-2* ]] || [[ "${PATCH_BRANCH}" = HBASE-25853 ]]; }; then
     extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}"
   fi
 
@@ -354,7 +355,7 @@ function refguide_filefilter
 
   if [[ ${filename} =~ src/main/asciidoc ]] ||
      [[ ${filename} =~ src/main/xslt ]] ||
-     [[ ${filename} =~ hbase-common/src/main/resources/hbase-default.xml ]]; then
+     [[ ${filename} =~ hbase-common/src/main/resources/hbase-default\.xml ]]; then
     add_test refguide
   fi
 }
@@ -464,7 +465,8 @@ function shadedjars_rebuild
   # If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
   # the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
   # logic is not both activated within Maven.
-  if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" =~ branch-2* ]] ; then
+    if [[ -n "${HADOOP_PROFILE}" ]] \
+       && { [[ "${PATCH_BRANCH}" = branch-2* ]] || [[ "${PATCH_BRANCH}" = HBASE-25853 ]]; }; then
     maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}")
   fi
 
@@ -495,7 +497,7 @@ function hadoopcheck_filefilter
 {
   local filename=$1
 
-  if [[ ${filename} =~ \.java$ ]] || [[ ${filename} =~ pom.xml$ ]]; then
+  if [[ ${filename} =~ \.java$ ]] || [[ ${filename} =~ pom\.xml$ ]]; then
     add_test hadoopcheck
   fi
 }
@@ -643,7 +645,7 @@ function hadoopcheck_rebuild
   done
 
   hadoop_profile=""
-  if [[ "${PATCH_BRANCH}" =~ branch-2* ]]; then
+  if [[ "${PATCH_BRANCH}" = branch-2* ]] || [[ "${PATCH_BRANCH}" = HBASE-25853 ]]; then
     hadoop_profile="-Dhadoop.profile=3.0"
   fi
   for hadoopver in ${hbase_hadoop3_versions}; do