Skip to content

Commit 260cd48

Browse files
authored
HBASE-27475 Use different jdks when running hadoopcheck in personality scripts (#4875)
Signed-off-by: GeorryHuang <[email protected]> Signed-off-by: Guanghao Zhang <[email protected]>
1 parent da99738 commit 260cd48

File tree

5 files changed

+21
-0
lines changed

5 files changed

+21
-0
lines changed

dev-support/Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ pipeline {
203203
BASEDIR = "${env.WORKSPACE}/component"
204204
TESTS = "${env.SHALLOW_CHECKS}"
205205
SET_JAVA_HOME = "/usr/lib/jvm/java-11"
206+
JAVA8_HOME="/usr/lib/jvm/java-8"
206207
// Activates hadoop 3.0 profile in maven runs.
207208
HADOOP_PROFILE = '3.0'
208209
OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_GENERAL}"

dev-support/Jenkinsfile_GitHub

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ pipeline {
7979
// customized per parallel stage
8080
PLUGINS = "${GENERAL_CHECK_PLUGINS}"
8181
SET_JAVA_HOME = "/usr/lib/jvm/java-11"
82+
JAVA8_HOME = "/usr/lib/jvm/java-8"
83+
HADOOP_PROFILE = '3.0'
8284
WORKDIR_REL = "${WORKDIR_REL_GENERAL_CHECK}"
8385
// identical for all parallel stages
8486
WORKDIR = "${WORKSPACE}/${WORKDIR_REL}"

dev-support/hbase-personality.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ function personality_parse_args
131131
delete_parameter "${i}"
132132
SUREFIRE_SECOND_PART_FORK_COUNT=${i#*=}
133133
;;
134+
--java8-home=*)
135+
delete_parameter "${i}"
136+
JAVA8_HOME=${i#*=}
137+
;;
134138
esac
135139
done
136140
}
@@ -560,6 +564,7 @@ function hadoopcheck_rebuild
560564
local result=0
561565
local hbase_hadoop2_versions
562566
local hbase_hadoop3_versions
567+
local savejavahome=${JAVA_HOME}
563568

564569
if [[ "${repostatus}" = branch ]]; then
565570
return 0
@@ -609,12 +614,18 @@ function hadoopcheck_rebuild
609614
export MAVEN_OPTS="${MAVEN_OPTS}"
610615
for hadoopver in ${hbase_hadoop2_versions}; do
611616
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
617+
# alawys use java8 to build with hadoop 2.x
618+
if [[ -n "${JAVA8_HOME}" ]]; then
619+
yetus_info "Switching to java 8 for building against hadoop 2.x"
620+
export JAVA_HOME=${JAVA8_HOME}
621+
fi
612622
# disabled because "maven_executor" needs to return both command and args
613623
# shellcheck disable=2046
614624
echo_and_redirect "${logfile}" \
615625
$(maven_executor) clean install \
616626
-DskipTests -DHBasePatchProcess \
617627
-Dhadoop-two.version="${hadoopver}"
628+
export JAVA_HOME=${savejavahome}
618629
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
619630
if [[ ${count} -gt 0 ]]; then
620631
add_vote_table -1 hadoopcheck "${BUILDMODEMSG} causes ${count} errors with Hadoop v${hadoopver}."

dev-support/hbase_nightly_yetus.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ if [[ -n "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}" ]]; then
101101
YETUS_ARGS=("--asf-nightlies-general-check-base=${ASF_NIGHTLIES_GENERAL_CHECK_BASE}" "${YETUS_ARGS[@]}")
102102
fi
103103

104+
if [[ -n "${JAVA8_HOME}" ]]; then
105+
YETUS_ARGS=("--java8-home=${JAVA8_HOME}" "${YETUS_ARGS[@]}")
106+
fi
107+
104108
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
105109
YETUS_ARGS=("--shelldocs=${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/shelldocs" "${YETUS_ARGS[@]}")
106110
TESTPATCHBIN="${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/test-patch"

dev-support/jenkins_precommit_github_yetus.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ fi
157157
if [[ -n "${SUREFIRE_SECOND_PART_FORK_COUNT}" ]]; then
158158
YETUS_ARGS+=("--surefire-second-part-fork-count=${SUREFIRE_SECOND_PART_FORK_COUNT}")
159159
fi
160+
if [[ -n "${JAVA8_HOME}" ]]; then
161+
YETUS_ARGS+=("--java8-home=${JAVA8_HOME}")
162+
fi
160163

161164
echo "Launching yetus with command line:"
162165
echo "${TESTPATCHBIN} ${YETUS_ARGS[*]}"

0 commit comments

Comments
 (0)