(hbase) branch HBASE-28694 updated: fix

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-28694
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/HBASE-28694 by this push:
     new 2871f4ea389 fix
2871f4ea389 is described below

commit 2871f4ea3890a6fcc7bbd97ffc8c64a6d6a46178
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Fri Jun 28 15:10:25 2024 +0800

    fix
---
 dev-support/Jenkinsfile                      | 2 +-
 dev-support/hbase_nightly_source-artifact.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index d870c8c1acc..d3510ba953c 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -802,7 +802,7 @@ pipeline {
               echo "Checking the steps for an RM to make a source artifact, 
then a binary artifact."
               docker build -t hbase-dev-support -f 
"${BASEDIR}/dev-support/docker/Dockerfile" .
               docker run -v "${WORKSPACE}":/hbase -v 
/etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
-                  -u `id -u`:`id -g` --workdir=/hbase hbase-dev-support \
+                  -u `id -u`:`id -g` -e JAVA_HOME="/usr/lib/jvm/java-17" 
--workdir=/hbase hbase-dev-support \
                   "component/dev-support/hbase_nightly_source-artifact.sh" \
                   --intermediate-file-dir output-srctarball \
                   --unpack-temp-dir unpacked_src_tarball \
diff --git a/dev-support/hbase_nightly_source-artifact.sh 
b/dev-support/hbase_nightly_source-artifact.sh
index b45fe54f634..59667408cfa 100755
--- a/dev-support/hbase_nightly_source-artifact.sh
+++ b/dev-support/hbase_nightly_source-artifact.sh
@@ -220,6 +220,7 @@ cd "${unpack_dir}"
 ${MVN} -Dmaven.repo.local="${m2_tarbuild}" help:active-profiles | grep -q 
hadoop-3.0
 if [ $? -ne 0 ]; then
   echo "The hadoop-3.0 profile is not activated by default, build a default 
tarball first."
+  # use java 8 to build with hadoop2
   JAVA_HOME="/usr/lib/jvm/java-8" build_tarball 0
   if [ $? -ne 0 ]; then
     exit 1
@@ -228,7 +229,7 @@ if [ $? -ne 0 ]; then
   # move the previous tarballs out, so it will not be cleaned while building 
against hadoop3
   mv "${unpack_dir}"/hbase-assembly/target/hbase-*-bin.tar.gz "${unpack_dir}"/
   echo "build a hadoop3 tarball."
-  JAVA_HOME="/usr/lib/jvm/java-17" build_tarball 1
+  build_tarball 1
   if [ $? -ne 0 ]; then
     exit 1
   fi
@@ -236,5 +237,5 @@ if [ $? -ne 0 ]; then
   mv "${unpack_dir}"/hbase-*-bin.tar.gz "${unpack_dir}"/hbase-assembly/target/
 else
   echo "The hadoop-3.0 profile is activated by default, build a default 
tarball."
-  JAVA_HOME="/usr/lib/jvm/java-17" build_tarball 0
+  build_tarball 0
 fi