[hbase] branch branch-2.2 updated: HBASE-20970 Update hadoop check versions for hadoop3 in hbase-personality

[zhangduo]

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

zhangduo pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 24eaae6  HBASE-20970 Update hadoop check versions for hadoop3 in 
hbase-personality
24eaae6 is described below

commit 24eaae67a157489c2bdda75facc6faab5b5e876d
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Wed May 15 16:34:52 2019 +0800

    HBASE-20970 Update hadoop check versions for hadoop3 in hbase-personality
    
    Signed-off-by: Sean Busbey <bus...@apache.org>
---
 dev-support/Jenkinsfile          | 2 +-
 dev-support/hbase-personality.sh | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 843506e..aa3ca36 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -139,7 +139,7 @@ pipeline {
         }
         stage ('hadoop 3 cache') {
           environment {
-            HADOOP3_VERSION="3.0.0"
+            HADOOP3_VERSION="3.0.3"
           }
           steps {
             // directory must be unique for each parallel stage, because 
jenkins runs them in the same workspace :(
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 4631a0a..9c54d6d 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -532,9 +532,16 @@ function hadoopcheck_rebuild
       hbase_hadoop2_versions="2.8.2 2.8.3 2.8.4 2.8.5 2.9.1 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=""
+  else
+    yetus_info "Setting Hadoop 3 versions to test based on 
branch-2.x/master/feature branch rules"
+    if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
+      hbase_hadoop3_versions="3.0.3 3.1.2"
+    else
+      hbase_hadoop2_versions="3.0.3 3.1.1 3.1.2"
+    fi
   fi
 
   export MAVEN_OPTS="${MAVEN_OPTS}"