HBASE-22500 Modify pom and jenkins jobs for hadoop versions

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
This commit is contained in:
Duo Zhang 2019-05-30 10:17:13 +08:00 committed by zhangduo
parent 78e4aea3c5
commit e4f4ae835f
3 changed files with 13 additions and 6 deletions

View File

@ -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 :(

View File

@ -530,19 +530,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}"

View File

@ -1419,7 +1419,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. -->