Repository: hbase Updated Branches: refs/heads/branch-2 55eb59e65 -> 914445277
HBASE-19489 Adds QUICK_HADOOPCHECK flag to check against only the latest maintenance releases in "hadoopcheck". Updates hadoop version to 3.0.0-beta1. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/91444527 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/91444527 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/91444527 Branch: refs/heads/branch-2 Commit: 9144452773bb4868410cf870fe90d157e438d688 Parents: 55eb59e Author: Apekshit Sharma <[email protected]> Authored: Tue Dec 12 23:22:04 2017 -0800 Committer: Apekshit Sharma <[email protected]> Committed: Wed Dec 13 00:36:34 2017 -0800 ---------------------------------------------------------------------- dev-support/hbase-personality.sh | 47 ++++++++++++++++---- .../src/main/resources/supplemental-models.xml | 4 +- pom.xml | 2 +- 3 files changed, 41 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/91444527/dev-support/hbase-personality.sh ---------------------------------------------------------------------- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 11f8731..2d6c826 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -234,6 +234,30 @@ function hadoopcheck_filefilter fi } +## @description Parse args to detect if QUICK_HADOOPCHECK mode is enabled. +## @audience private +## @stability evolving +function hadoopcheck_parse_args +{ + declare i + + for i in "$@"; do + case ${i} in + --quick-hadoopcheck) + QUICK_HADOOPCHECK=true + ;; + esac + done +} + +## @description Adds QUICK_HADOOPCHECK env variable to DOCKER_EXTRAARGS. +## @audience private +## @stability evolving +function hadoopcheck_docker_support +{ + DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "--env=QUICK_HADOOPCHECK=${QUICK_HADOOPCHECK}") +} + ## @description hadoopcheck test ## @audience private ## @stability evolving @@ -260,18 +284,23 @@ function hadoopcheck_rebuild # All supported Hadoop versions that we want to test the compilation with # See the Hadoop section on prereqs in the HBase Reference Guide + hbase_common_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" if [[ "${PATCH_BRANCH}" = branch-1* ]]; then - yetus_info "setting Hadoop versions to test based on branch-1-ish rules." - hbase_hadoop2_versions="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" + yetus_info "Setting Hadoop versions to test based on branch-1-ish rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.4.1 2.5.2 2.6.5 2.7.4" + else + hbase_hadoop2_versions="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 ${hbase_common_hadoop2_versions}" + fi hbase_hadoop3_versions="" - elif [[ ${PATCH_BRANCH} = branch-2* ]]; then - yetus_info "setting Hadoop versions to test based on branch-2-ish rules." - hbase_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" - hbase_hadoop3_versions="3.0.0-alpha4" else # master or a feature branch - yetus_info "setting Hadoop versions to test based on master/feature branch rules." - hbase_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" - hbase_hadoop3_versions="3.0.0-alpha4" + yetus_info "Setting Hadoop versions to test based on branch-2/master/feature branch rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.6.5 2.7.4" + else + hbase_hadoop2_versions="${hbase_common_hadoop2_versions}" + fi + hbase_hadoop3_versions="3.0.0-beta1" fi export MAVEN_OPTS="${MAVEN_OPTS}" http://git-wip-us.apache.org/repos/asf/hbase/blob/91444527/hbase-resource-bundle/src/main/resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 33715eb..08f97fe 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -1867,7 +1867,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </project> </supplement> <supplement> - <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-alpha4 --> + <project> <!-- hadoop.profile=3.0 from hadoop-3.0.0-beta1 --> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> <version>3.1.4</version> @@ -2366,7 +2366,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" http://git-wip-us.apache.org/repos/asf/hbase/blob/91444527/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3c3473c..15f712f 100644 --- a/pom.xml +++ b/pom.xml @@ -1313,7 +1313,7 @@ <java.min.version>${compileSource}</java.min.version> <!-- Dependencies --> <hadoop-two.version>2.7.4</hadoop-two.version> - <hadoop-three.version>3.0.0-alpha4</hadoop-three.version> + <hadoop-three.version>3.0.0-beta1</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. -->
