You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/05/30 14:46:25 UTC
[hbase] branch branch-2 updated: HBASE-22500 Modify pom and jenkins
jobs for hadoop versions
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 59973d2 HBASE-22500 Modify pom and jenkins jobs for hadoop versions
59973d2 is described below
commit 59973d2024e3aa302b50b045607f242e0fae878e
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu May 30 10:17:13 2019 +0800
HBASE-22500 Modify pom and jenkins jobs for hadoop versions
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
dev-support/Jenkinsfile | 4 ++--
dev-support/hbase-personality.sh | 13 ++++++++++---
pom.xml | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index fa112a4..9540a0d 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -116,7 +116,7 @@ pipeline {
}
stage ('hadoop 2 cache') {
environment {
- HADOOP2_VERSION="2.8.2"
+ HADOOP2_VERSION="2.8.5"
}
steps {
// directory must be unique for each parallel stage, because jenkins runs them in the same workspace :(
@@ -143,7 +143,7 @@ pipeline {
}
stage ('hadoop 3 cache') {
environment {
- HADOOP3_VERSION="3.0.3"
+ HADOOP3_VERSION="3.1.1"
}
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 d5f0177..94f03ce 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -529,19 +529,26 @@ function hadoopcheck_rebuild
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
hbase_hadoop2_versions="2.8.5 2.9.2"
else
- hbase_hadoop2_versions="2.8.2 2.8.3 2.8.4 2.8.5 2.9.1 2.9.2"
+ hbase_hadoop2_versions="2.8.5 2.9.2"
fi
fi
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"
+ elif [[ "${PATCH_BRANCH}" = branch-2.0 ]] || [[ "${PATCH_BRANCH}" = branch-2.1 ]]; then
+ yetus_info "Setting Hadoop 3 versions to test based on branch-2.0/branch-2.1 rules"
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
hbase_hadoop3_versions="3.0.3 3.1.2"
else
hbase_hadoop3_versions="3.0.3 3.1.1 3.1.2"
fi
+ else
+ yetus_info "Setting Hadoop 3 versions to test based on branch-2.2+/master/feature branch rules"
+ if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
+ hbase_hadoop3_versions="3.1.2"
+ else
+ hbase_hadoop3_versions="3.1.1 3.1.2"
+ fi
fi
export MAVEN_OPTS="${MAVEN_OPTS}"
diff --git a/pom.xml b/pom.xml
index 4ceaeac..4b5957d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1283,7 +1283,7 @@
<java.min.version>${compileSource}</java.min.version>
<!-- Dependencies -->
<hadoop-two.version>2.8.5</hadoop-two.version>
- <hadoop-three.version>3.0.3</hadoop-three.version>
+ <hadoop-three.version>3.1.1</hadoop-three.version>
<!-- These must be defined here for downstream build tools that don't look at profiles.
They ought to match the values found in our default hadoop profile, which is
currently "hadoop-2.0". See HBASE-15925 for more info. -->