This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new f3bccd8cdeb branch-3.1: [chore](regression) fix java home
inconsistency #57095 (#57619)
f3bccd8cdeb is described below
commit f3bccd8cdeb54a9ffad24c7b55df5679601470c6
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 7 15:31:40 2025 +0800
branch-3.1: [chore](regression) fix java home inconsistency #57095 (#57619)
Cherry-picked from #57095
Co-authored-by: wudi <[email protected]>
---
.../connector_p0/spark_connector/spark_connector_arrow.groovy | 11 ++++++++---
.../spark_connector/spark_connector_read_type.groovy | 11 ++++++++---
.../suites/flink_connector_p0/flink_connector.groovy | 10 +++++++---
.../suites/flink_connector_p0/flink_connector_syncdb.groovy | 11 ++++++++---
.../suites/flink_connector_p0/flink_connector_type.groovy | 10 +++++++---
5 files changed, 38 insertions(+), 15 deletions(-)
diff --git
a/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
b/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
index 7d9d07e7af3..08fcc1807c4 100644
---
a/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
+++
b/regression-test/suites/connector_p0/spark_connector/spark_connector_arrow.groovy
@@ -135,11 +135,16 @@ suite("spark_connector_for_arrow", "connector") {
def download_spark_jar = "/usr/bin/curl
${getS3Url()}/regression/${jar_name} --output ${jar_name}".execute().getText()
logger.info("finish download spark doris demo ...")
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
+
def addOpens = ""
if (javaVersion.startsWith("17")) {
addOpens = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED"
diff --git
a/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
b/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
index 03345335105..78a157256f7 100644
---
a/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
+++
b/regression-test/suites/connector_p0/spark_connector/spark_connector_read_type.groovy
@@ -98,11 +98,16 @@ suite("spark_connector_read_type", "connector") {
def download_spark_jar = "/usr/bin/curl
${getS3Url()}/regression/spark-doris-read-jar-with-dependencies.jar --output
spark-doris-read.jar".execute().getText()
logger.info("finish download spark doris demo ...")
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
+
def addOpens = ""
if (javaVersion.startsWith("17")) {
addOpens = "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED"
diff --git a/regression-test/suites/flink_connector_p0/flink_connector.groovy
b/regression-test/suites/flink_connector_p0/flink_connector.groovy
index 93b0552919b..114e28fd65f 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector.groovy
@@ -42,11 +42,15 @@ suite("flink_connector") {
return
}
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
def run_cmd = "${javaPath} -cp flink-doris-demo.jar
com.doris.DorisFlinkDfSinkDemo $context.config.feHttpAddress
regression_test_flink_connector_p0.$tableName $context.config.feHttpUser"
logger.info("run_cmd : $run_cmd")
diff --git
a/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
b/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
index ad72bbfaa4e..6719c4591e3 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector_syncdb.groovy
@@ -74,10 +74,15 @@ PROPERTIES (
throw new Exception("File flink-doris-syncdb.jar download failed.")
}
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
+
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
def addOpens = ""
if (javaVersion.startsWith("17")) {
diff --git
a/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
b/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
index d5a9d97d2bd..476acb86e24 100644
--- a/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
+++ b/regression-test/suites/flink_connector_p0/flink_connector_type.groovy
@@ -124,11 +124,15 @@ VALUES
logger.info("flink-doris-case.jar download failed")
throw new Exception("File flink-doris-case.jar download failed.")
}
+ def systemJavaPath = ["bash", "-c", "which java"].execute().text.trim()
+ logger.info("System java path: ${systemJavaPath}")
+
+ def runtimeJavaHome = System.getProperty("java.home")
+ logger.info("Runtime java home: ${runtimeJavaHome}")
+ def javaPath = "${runtimeJavaHome}/bin/java"
- def javaPath = ["bash", "-c", "which java"].execute().text.trim()
- logger.info("System java path: ${javaPath}")
def javaVersion = System.getProperty("java.version")
- logger.info("System java version: ${javaVersion}")
+ logger.info("Runtime java version: ${javaVersion}")
def addOpens = ""
if (javaVersion.startsWith("17")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
