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

[zh...@apache.org]

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

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


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

commit 5a578f953bedddd135c9cc5f0dbcb02340815230
Author: Duo Zhang <zh...@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 <bu...@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 4c8fd5d..6016c42 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 1d59b28..15a5131 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -533,9 +533,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}"