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

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


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

commit f602891d46b521a76284e025be6abd105cc28e0a
Author: Duo Zhang <[email protected]>
AuthorDate: Sun Mar 1 13:29:24 2026 +0800

    fix
---
 dev-support/integration-test/integration-test.Jenkinsfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev-support/integration-test/integration-test.Jenkinsfile 
b/dev-support/integration-test/integration-test.Jenkinsfile
index 45e4fd063a0..b684b953d8e 100644
--- a/dev-support/integration-test/integration-test.Jenkinsfile
+++ b/dev-support/integration-test/integration-test.Jenkinsfile
@@ -166,7 +166,7 @@ pipeline {
               sh '''#!/bin/bash -e
                 echo "Setting up directories"
                 rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
-                echo "(x) {color:red}-1 client integration test{color}\n-- 
Something went wrong with this stage, [check relevant console 
output|${BUILD_URL}/console]." >${OUTPUT_DIR}/commentfile
+                echo "(x) {color:red}-1 client integration test for 
${HADOOP_VERSION}{color}\n-- Something went wrong with this stage, [check 
relevant console output|${BUILD_URL}/console]." >${OUTPUT_DIR}/commentfile
                 rm -rf "unpacked_src_tarball"
                 rm -rf "hbase-install" && mkdir "hbase-install"
                 rm -rf "hbase-client" && mkdir "hbase-client"
@@ -239,10 +239,9 @@ pipeline {
                   hbase_install_dir="hbase-hadoop3-install"
                   hbase_client_dir="hbase-hadoop3-client"
                 fi
+                java_home="/usr/lib/jvm/java-17"
                 if [[ ${HADOOP_VERSION} == 2.* ]]; then
-                  java_home = "/usr/lib/jvm/java-8"
-                else
-                  java_home = "/usr/lib/jvm/java-17"
+                  java_home="/usr/lib/jvm/java-8"
                 fi
                 echo "Attempting to run an instance on top of Hadoop 
${HADOOP_VERSION}."
                 # Create working dir
@@ -264,7 +263,7 @@ pipeline {
                   hadoop-install/bin/mapred \
                   >${OUTPUT_DIR}/hadoop.log 2>&1
                 if [ $? -ne 0 ]; then
-                  echo "(x) {color:red}-1 client integration 
test{color}\n--Failed when running client tests on top of Hadoop 
${HADOOP_VERSION}. [see log for 
details|${BUILD_URL}/artifact/${OUTPUT_DIR}/hadoop.log]. (note that this means 
we didn't check the Hadoop ${HADOOP_VERSION} shaded client)" 
>${OUTPUT_DIR}/commentfile
+                  echo "(x) {color:red}-1 client integration test for 
${HADOOP_VERSION}{color}\n--Failed when running client tests on top of Hadoop 
${HADOOP_VERSION}. [see log for 
details|${BUILD_URL}/artifact/${OUTPUT_DIR}/hadoop.log]. (note that this means 
we didn't check the Hadoop ${HADOOP_VERSION} shaded client)" 
>${OUTPUT_DIR}/commentfile
                   exit 2
                 fi
                 echo "(/) {color:green}+1 client integration test for 
${HADOOP_VERSION} {color}" >${OUTPUT_DIR}/commentfile
@@ -276,7 +275,7 @@ pipeline {
                 rm -rf "${OUTPUT_DIR}/shaded" && mkdir "${OUTPUT_DIR}/shaded"
                 echo "Attempting to run an instance on top of Hadoop 
${HADOOP_VERSION}, relying on the Hadoop client artifacts for the example 
client program."
                 docker run --rm -v "${WORKSPACE}":/hbase -v 
/etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
-                  -u `id -u`:`id -g` -e JAVA_HOME="/usr/lib/jvm/java-17" \
+                  -u `id -u`:`id -g` -e JAVA_HOME="${java_home}" \
                   -e HADOOP_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED" 
\
                   --workdir=/hbase hbase-integration-test \
                   
component/dev-support/integration-test/pseudo-distributed-test.sh \
@@ -292,10 +291,10 @@ pipeline {
                   hadoop-install/bin/mapred \
                   >${OUTPUT_DIR}/hadoop-shaded.log 2>&1
                 if [ $? -ne 0 ]; then
-                  echo "(x) {color:red}-1 client integration 
test{color}\n--Failed when running client tests on top of Hadoop 
${HADOOP_VERSION} using Hadoop's shaded client. [see log for 
details|${BUILD_URL}/artifact/${OUTPUT_DIR}/hadoop-shaded.log]." >> 
${OUTPUT_DIR}/commentfile
+                  echo "(x) {color:red}-1 client integration testfor 
${HADOOP_VERSION}{color}\n--Failed when running client tests on top of Hadoop 
${HADOOP_VERSION} using Hadoop's shaded client. [see log for 
details|${BUILD_URL}/artifact/${OUTPUT_DIR}/hadoop-shaded.log]." >> 
${OUTPUT_DIR}/commentfile
                   exit 2
                 fi
-                echo "(/) {color:green}+1 client integration test for 
${HADOOP_VERSION} with shaded hadoop client {color}" >> 
${OUTPUT_DIR}/commentfile
+                echo "(/) {color:green}+1 client integration test for 
${HADOOP_VERSION} with shaded hadoop client{color}" >> ${OUTPUT_DIR}/commentfile
               '''
             } // steps
             post {

Reply via email to