From 3c3aac8abeba355960f5167a4682aa456f71df99 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Wed, 15 May 2019 16:34:52 +0800 Subject: [PATCH] HBASE-20970 Update hadoop check versions for hadoop3 in hbase-personality --- 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 4c8fd5d240..6016c423ec 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 1d59b28e6d..15a5131db2 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}" -- 2.17.1