This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ed87894e525 [chore](ci) pr for dev branch can run cloud_p0 and
performance (#49466)
ed87894e525 is described below
commit ed87894e5253ba923f6d14ed838580ae46fea6c8
Author: Dongyang Li <lidongy...@selectdb.com>
AuthorDate: Tue Mar 25 20:20:08 2025 +0800
[chore](ci) pr for dev branch can run cloud_p0 and performance (#49466)
---
regression-test/pipeline/cloud_p0/prepare.sh | 10 ++--------
regression-test/pipeline/performance/prepare.sh | 20 +++++++++-----------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/regression-test/pipeline/cloud_p0/prepare.sh
b/regression-test/pipeline/cloud_p0/prepare.sh
index 30e86946e51..03b464651b8 100644
--- a/regression-test/pipeline/cloud_p0/prepare.sh
+++ b/regression-test/pipeline/cloud_p0/prepare.sh
@@ -67,14 +67,8 @@ fi
# shellcheck source=/dev/null
source "$(bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'get')"
if ${skip_pipeline:=false}; then echo "INFO: skip build pipline" && exit 0;
else echo "INFO: no skip"; fi
-if [[ "${target_branch}" == "master" ]]; then
- echo "INFO: PR target branch ${target_branch}"
- install_java
-else
- echo "WARNING: PR target branch ${target_branch} is NOT in (master), skip
pipeline."
- bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'set' "export skip_pipeline=true"
- exit 0
-fi
+echo "INFO: PR target branch ${target_branch}"
+install_java
# shellcheck source=/dev/null
# _get_pr_changed_files file_changed_performance
diff --git a/regression-test/pipeline/performance/prepare.sh
b/regression-test/pipeline/performance/prepare.sh
index 1f8e22aed09..3d6734ab9e5 100644
--- a/regression-test/pipeline/performance/prepare.sh
+++ b/regression-test/pipeline/performance/prepare.sh
@@ -74,18 +74,16 @@ source "$(bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/g
source
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/doris-utils.sh
if ${skip_pipeline:=false}; then echo "INFO: skip build pipline" && exit 0;
else echo "INFO: no skip"; fi
-if [[ "${target_branch}" == "master" ]]; then
- echo "INFO: PR target branch ${target_branch}"
- install_java
- JAVA_HOME="${JAVA_HOME:-$(find /usr/lib/jvm -maxdepth 1 -type d -name
'java-17-*' | sed -n '1p')}"
- bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'set' "export JAVA_HOME=\"${JAVA_HOME}\""
-elif [[ "${target_branch}" == "branch-2.0" ]]; then
- echo "INFO: PR target branch ${target_branch}"
-else
- echo "WARNING: PR target branch ${target_branch} is NOT in (master,
branch-2.0), skip pipeline."
- bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'set' "export skip_pipeline=true"
- exit 0
+
+echo "INFO: PR target branch ${target_branch}"
+if ! [[ "${target_branch}" == master || "${target_branch}" == branch-2.0 ]];
then
+ # if target branch is not master or branch-2.0, set target_branch to
master to use the same doris meta and storage
+ bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'set' "export target_branch=master"
fi
+install_java
+JAVA_HOME="${JAVA_HOME:-$(find /usr/lib/jvm -maxdepth 1 -type d -name
'java-17-*' | sed -n '1p')}"
+bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'set' "export JAVA_HOME=\"${JAVA_HOME}\""
+
# shellcheck source=/dev/null
# _get_pr_changed_files file_changed_performance
source
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/github-utils.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
