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 2022/11/10 05:09:01 UTC
[hbase] branch HBASE-27475 updated (0de66e0ee38 -> d6639714f65)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch HBASE-27475
in repository https://gitbox.apache.org/repos/asf/hbase.git
omit 0de66e0ee38 for hadoop-profile
omit 65c2c5b5ffc for HBASE-27475
omit 6aa8d7b63c3 disable other checks
omit ee4599d0438 HBASE-27475 Use different jdks when running hadoopcheck in personality scripts
new d6baa5a1c37 HBASE-27475 Use different jdks when running hadoopcheck in personality scripts
new d6639714f65 disable other checks
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0de66e0ee38)
\
N -- N -- N refs/heads/HBASE-27475 (d6639714f65)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/Jenkinsfile_GitHub | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[hbase] 01/02: HBASE-27475 Use different jdks when running hadoopcheck in personality scripts
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-27475
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d6baa5a1c373c718065afbf51e2d1bdc16f6cd98
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Nov 9 23:19:40 2022 +0800
HBASE-27475 Use different jdks when running hadoopcheck in personality scripts
---
dev-support/Jenkinsfile | 3 ++-
dev-support/Jenkinsfile_GitHub | 2 ++
dev-support/hbase-personality.sh | 13 ++++++++++++-
dev-support/hbase_nightly_yetus.sh | 4 ++++
dev-support/jenkins_precommit_github_yetus.sh | 3 +++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 8bbb00ebbb9..6d4a00d1dd3 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
OUTPUT_DIR_RELATIVE_JDK11_HADOOP3 = 'output-jdk11-hadoop3'
PROJECT = 'hbase'
- PROJECT_PERSONALITY = 'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
+ PROJECT_PERSONALITY = 'https://raw.githubusercontent.com/apache/hbase/HBASE-27475/dev-support/hbase-personality.sh'
PERSONALITY_FILE = 'tools/personality.sh'
// This section of the docs tells folks not to use the javadoc tag. older branches have our old version of the check for said tag.
AUTHOR_IGNORE_LIST = 'src/main/asciidoc/_chapters/developer.adoc,dev-support/test-patch.sh'
@@ -203,6 +203,7 @@ pipeline {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.SHALLOW_CHECKS}"
SET_JAVA_HOME = "/usr/lib/jvm/java-11"
+ JAVA8_HOME="/usr/lib/jvm/java-8"
// Activates hadoop 3.0 profile in maven runs.
HADOOP_PROFILE = '3.0'
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index ac548757df2..753ecaaa5b5 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -79,6 +79,8 @@ pipeline {
// customized per parallel stage
PLUGINS = "${GENERAL_CHECK_PLUGINS}"
SET_JAVA_HOME = "/usr/lib/jvm/java-11"
+ JAVA8_HOME = "/usr/lib/jvm/java-8"
+ HADOOP_PROFILE = '3.0'
WORKDIR_REL = "${WORKDIR_REL_GENERAL_CHECK}"
// identical for all parallel stages
WORKDIR = "${WORKSPACE}/${WORKDIR_REL}"
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 5f18b4652af..1f8e549201b 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -131,6 +131,10 @@ function personality_parse_args
delete_parameter "${i}"
SUREFIRE_SECOND_PART_FORK_COUNT=${i#*=}
;;
+ --java8-home=*)
+ delete_parameter "${i}"
+ JAVA8_HOME=${i#*=}
+ ;;
esac
done
}
@@ -560,6 +564,7 @@ function hadoopcheck_rebuild
local result=0
local hbase_hadoop2_versions
local hbase_hadoop3_versions
+ local savejavahome=${JAVA_HOME}
if [[ "${repostatus}" = branch ]]; then
return 0
@@ -582,7 +587,7 @@ function hadoopcheck_rebuild
else
hbase_hadoop2_versions="2.10.0 2.10.1 2.10.2"
fi
- elif [[ "${PATCH_BRANCH}" = branch-2.* ]]; then
+ elif [[ "${PATCH_BRANCH}" = branch-2.* ]] || [[ "${PATCH_BRANCH}" == "HBASE-27475" ]]; then
yetus_info "Setting Hadoop 2 versions to test based on branch-2.5+ rules."
hbase_hadoop2_versions="2.10.2"
else
@@ -609,12 +614,18 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # alawys use java8 to build with hadoop 2.x
+ if [[ -n "${JAVA8_HOME}" ]]; then
+ yetus_info "Switching to java 8 for building against hadoop 2.x"
+ export JAVA_HOME=${JAVA8_HOME}
+ fi
# disabled because "maven_executor" needs to return both command and args
# shellcheck disable=2046
echo_and_redirect "${logfile}" \
$(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
+ export JAVA_HOME=${savejavahome}
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
if [[ ${count} -gt 0 ]]; then
add_vote_table -1 hadoopcheck "${BUILDMODEMSG} causes ${count} errors with Hadoop v${hadoopver}."
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index 3fb1ac7bfce..d824412835c 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -101,6 +101,10 @@ if [[ -n "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}" ]]; then
YETUS_ARGS=("--asf-nightlies-general-check-base=${ASF_NIGHTLIES_GENERAL_CHECK_BASE}" "${YETUS_ARGS[@]}")
fi
+if [[ -n "${JAVA8_HOME}" ]]; then
+ YETUS_ARGS=("--java8-home=${JAVA8_HOME}" "${YETUS_ARGS[@]}")
+fi
+
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_ARGS=("--shelldocs=${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/shelldocs" "${YETUS_ARGS[@]}")
TESTPATCHBIN="${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/test-patch"
diff --git a/dev-support/jenkins_precommit_github_yetus.sh b/dev-support/jenkins_precommit_github_yetus.sh
index c3da3263556..f5a7315b2d2 100755
--- a/dev-support/jenkins_precommit_github_yetus.sh
+++ b/dev-support/jenkins_precommit_github_yetus.sh
@@ -157,6 +157,9 @@ fi
if [[ -n "${SUREFIRE_SECOND_PART_FORK_COUNT}" ]]; then
YETUS_ARGS+=("--surefire-second-part-fork-count=${SUREFIRE_SECOND_PART_FORK_COUNT}")
fi
+if [[ -n "${JAVA8_HOME}" ]]; then
+ YETUS_ARGS+=("--java8-home=${JAVA8_HOME}")
+fi
echo "Launching yetus with command line:"
echo "${TESTPATCHBIN} ${YETUS_ARGS[*]}"
[hbase] 02/02: disable other checks
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-27475
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d6639714f65981f7c6f4ef93917f921de6e7ae8a
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Nov 9 23:22:48 2022 +0800
disable other checks
---
dev-support/Jenkinsfile | 11 ++++++++++-
dev-support/Jenkinsfile_GitHub | 6 ++++++
dev-support/hbase-personality.sh | 6 +++---
dev-support/hbase_nightly_yetus.sh | 2 +-
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 6d4a00d1dd3..050a6353f08 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -304,7 +304,7 @@ pipeline {
}
}
when {
- branch 'branch-2*'
+ branch 'branch-1*'
}
environment {
BASEDIR = "${env.WORKSPACE}/component"
@@ -413,6 +413,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.DEEP_CHECKS}"
@@ -522,6 +525,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.DEEP_CHECKS}"
@@ -636,6 +642,9 @@ pipeline {
label 'hbase-large'
}
}
+ when {
+ branch 'branch-1*'
+ }
tools {
maven 'maven_latest'
// this needs to be set to the jdk that ought to be used to build releases on the branch the Jenkinsfile is stored in.
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 753ecaaa5b5..dd63f4e0209 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -200,6 +200,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
// customized per parallel stage
PLUGINS = "${JDK_SPECIFIC_PLUGINS}"
@@ -332,6 +335,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
// customized per parallel stage
PLUGINS = "${JDK_SPECIFIC_PLUGINS}"
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 1f8e549201b..05512e966d3 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -178,7 +178,7 @@ function personality_modules
# If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
# the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
# logic is not both activated within Maven.
- if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" = branch-2* ]] ; then
+ if [[ -n "${HADOOP_PROFILE}" ]]; then
extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}"
fi
@@ -490,7 +490,7 @@ function shadedjars_rebuild
# If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
# the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
# logic is not both activated within Maven.
- if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" = branch-2* ]] ; then
+ if [[ -n "${HADOOP_PROFILE}" ]]; then
maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}")
fi
@@ -635,7 +635,7 @@ function hadoopcheck_rebuild
done
hadoop_profile=""
- if [[ "${PATCH_BRANCH}" = branch-2* ]]; then
+ if [[ "${PATCH_BRANCH}" = branch-2* ]] || [[ "${PATCH_BRANCH}" = "HBASE-27475" ]]; then
hadoop_profile="-Dhadoop.profile=3.0"
fi
for hadoopver in ${hbase_hadoop3_versions}; do
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index d824412835c..44fb76ad4e2 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -78,7 +78,7 @@ fi
if [[ -n "${HADOOP_PROFILE}" ]]; then
# Master has only Hadoop3 support. We don't need to activate any profile.
# The Jenkinsfile should not attempt to run any Hadoop2 tests.
- if [[ "${BRANCH_NAME}" =~ branch-2* ]]; then
+ if [[ "${BRANCH_NAME}" =~ branch-2* ]] || [[ "${BRANCH_NAME}" = "HBASE-27475" ]]; then
YETUS_ARGS=("--hadoop-profile=${HADOOP_PROFILE}" "${YETUS_ARGS[@]}")
fi
fi