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 cfd990d0775 [ci](branch-4.0) adjust pipeline for 4.0 (#56296)
cfd990d0775 is described below
commit cfd990d0775e85d9fd2fe71becf16b1454fea140
Author: Dongyang Li <[email protected]>
AuthorDate: Tue Sep 23 20:23:09 2025 +0800
[ci](branch-4.0) adjust pipeline for 4.0 (#56296)
---
.github/workflows/comment-to-trigger-teamcity.yml | 4 ++++
regression-test/pipeline/common/teamcity-utils.sh | 5 +++--
regression-test/pipeline/performance/compile.sh | 2 +-
regression-test/pipeline/performance/prepare.sh | 4 ++--
regression-test/pipeline/performance/run-clickbench.sh | 6 +++---
regression-test/pipeline/performance/run-load.sh | 10 +++++-----
regression-test/pipeline/performance/run-tpcds.sh | 6 +++---
regression-test/pipeline/performance/run-tpch.sh | 6 +++---
regression-test/pipeline/vault_p0/prepare.sh | 4 ++--
9 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/comment-to-trigger-teamcity.yml
b/.github/workflows/comment-to-trigger-teamcity.yml
index 251794147a2..c4872af2b02 100644
--- a/.github/workflows/comment-to-trigger-teamcity.yml
+++ b/.github/workflows/comment-to-trigger-teamcity.yml
@@ -83,6 +83,10 @@ jobs:
echo "COMMENT_USER_ID ${COMMENT_USER_ID} is allowed to skip
buildall for branch-3.1"
echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
echo "comment_skip=true" | tee -a "$GITHUB_OUTPUT"
+ elif [[ "${COMMENT_USER_ID}" == '9208457' && "${TARGET_BRANCH}" ==
*'branch-4.0'* ]]; then
+ echo "COMMENT_USER_ID ${COMMENT_USER_ID} is allowed to skip
buildall for branch-4.0"
+ echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
+ echo "comment_skip=true" | tee -a "$GITHUB_OUTPUT"
else
echo "COMMENT_USER_ID ${COMMENT_USER_ID} is not allowed to
skip buildall."
exit
diff --git a/regression-test/pipeline/common/teamcity-utils.sh
b/regression-test/pipeline/common/teamcity-utils.sh
index f74b99d9f0b..6e9da5679f7 100644
--- a/regression-test/pipeline/common/teamcity-utils.sh
+++ b/regression-test/pipeline/common/teamcity-utils.sh
@@ -25,8 +25,9 @@
# 控制哪些分支可以跑哪些流水线
declare -A targetBranch_to_pipelines
targetBranch_to_pipelines=(
- ['master']='feut beut cloudut compile p0 p1 external arm performance
cloud_p0 cloud_p1 vault_p0 nonConcurrent check_coverage'
- ['branch-3.1']='feut beut cloudut compile p0 p1 external arm performance
cloud_p0 cloud_p1 vault_p0 nonConcurrent check_coverage'
+ ['master']='feut beut cloudut compile p0 p1 external arm performance
cloud_p0 cloud_p1 vault_p0 nonConcurrent check_coverage check_coverage_fe'
+ ['branch-4.0']='feut beut cloudut compile p0 p1 external arm performance
cloud_p0 cloud_p1 vault_p0 nonConcurrent check_coverage check_coverage_fe'
+ ['branch-3.1']='feut beut cloudut compile p0 p1 external arm performance
cloud_p0 cloud_p1 vault_p0 nonConcurrent check_coverage check_coverage_fe'
['branch-3.0']='feut beut cloudut compile p0 p1 external arm performance
cloud_p0 cloud_p1 vault_p0 nonConcurrent check_coverage'
['branch-2.1']='feut beut compile p0 p1 external arm'
['branch-2.0']='feut beut compile p0 p1 external arm performance'
diff --git a/regression-test/pipeline/performance/compile.sh
b/regression-test/pipeline/performance/compile.sh
index 8af027f8022..a8db2de5d8b 100644
--- a/regression-test/pipeline/performance/compile.sh
+++ b/regression-test/pipeline/performance/compile.sh
@@ -75,7 +75,7 @@ merge_pr_to_target_branch_latest() {
fi
}
-if [[ "${target_branch}" == "master" ]]; then
+if [[ "${target_branch}" == "master" || "${target_branch}" == "branch-4.0" ]];
then
REMOTE_CCACHE='/mnt/remote_ccache_master'
docker_image="apache/doris:build-env-ldb-toolchain-latest"
elif [[ "${target_branch}" == "branch-3.1" ]]; then
diff --git a/regression-test/pipeline/performance/prepare.sh
b/regression-test/pipeline/performance/prepare.sh
index 3d6734ab9e5..0b7d4fdd916 100644
--- a/regression-test/pipeline/performance/prepare.sh
+++ b/regression-test/pipeline/performance/prepare.sh
@@ -76,8 +76,8 @@ source
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/doris-uti
if ${skip_pipeline:=false}; then echo "INFO: skip build pipline" && exit 0;
else echo "INFO: no skip"; fi
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
+if ! [[ "${target_branch}" == master || "${target_branch}" == branch-4.0 ]];
then
+ # if target branch is not master or branch-4.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
diff --git a/regression-test/pipeline/performance/run-clickbench.sh
b/regression-test/pipeline/performance/run-clickbench.sh
index 286ce1df9a2..3990d08fe84 100644
--- a/regression-test/pipeline/performance/run-clickbench.sh
+++ b/regression-test/pipeline/performance/run-clickbench.sh
@@ -257,9 +257,9 @@ exit_flag=0
bash
"${teamcity_build_checkoutDir}"/tools/clickbench-tools/run-clickbench-queries.sh
cold_run_time_threshold=${cold_run_time_threshold_master:-120} # 单位 秒
hot_run_time_threshold=${hot_run_time_threshold_master:-34} # 单位 秒
- if [[ "${target_branch}" == "branch-2.0" ]]; then
- cold_run_time_threshold=${cold_run_time_threshold_branch20:-110} # 单位 秒
- hot_run_time_threshold=${hot_run_time_threshold_branch20:-34} # 单位 秒
+ if [[ "${target_branch}" == "branch-4.0" ]]; then
+ cold_run_time_threshold=${cold_run_time_threshold_branch40:-120} # 单位 秒
+ hot_run_time_threshold=${hot_run_time_threshold_branch40:-34} # 单位 秒
elif [[ "${target_branch}" == "branch-3.1" ]]; then
cold_run_time_threshold=${cold_run_time_threshold_branch31:-120} # 单位 秒
hot_run_time_threshold=${hot_run_time_threshold_branch31:-34} # 单位 秒
diff --git a/regression-test/pipeline/performance/run-load.sh
b/regression-test/pipeline/performance/run-load.sh
index 156024ffcee..bdb853f263c 100644
--- a/regression-test/pipeline/performance/run-load.sh
+++ b/regression-test/pipeline/performance/run-load.sh
@@ -666,11 +666,11 @@ exit_flag=0
stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold_master:-15}
# 单位 MB/s
stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold_master:-22}
# 单位 MB/s
insert_into_select_speed_threshold=${insert_into_select_speed_threshold_master:-700}
# 单位 Krows/s
- if [[ "${target_branch}" == "branch-2.0" ]]; then
-
stream_load_json_speed_threshold=${stream_load_json_speed_threshold_branch20:-105}
# 单位 MB/s
-
stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold_branch20:-15}
# 单位 MB/s
-
stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold_branch20:-22}
# 单位 MB/s
-
insert_into_select_speed_threshold=${insert_into_select_speed_threshold_branch20:-410}
# 单位 Krows/s
+ if [[ "${target_branch}" == "branch-4.0" ]]; then
+
stream_load_json_speed_threshold=${stream_load_json_speed_threshold_branch40:-115}
# 单位 MB/s
+
stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold_branch40:-15}
# 单位 MB/s
+
stream_load_parquet_speed_threshold=${stream_load_parquet_speed_threshold_branch40:-22}
# 单位 MB/s
+
insert_into_select_speed_threshold=${insert_into_select_speed_threshold_branch40:-700}
# 单位 Krows/s
elif [[ "${target_branch}" == "branch-3.1" ]]; then
stream_load_json_speed_threshold=${stream_load_json_speed_threshold_branch31:-115}
# 单位 MB/s
stream_load_orc_speed_threshold=${stream_load_orc_speed_threshold_branch31:-15}
# 单位 MB/s
diff --git a/regression-test/pipeline/performance/run-tpcds.sh
b/regression-test/pipeline/performance/run-tpcds.sh
index d40c75fe186..d11b4bbcaed 100644
--- a/regression-test/pipeline/performance/run-tpcds.sh
+++ b/regression-test/pipeline/performance/run-tpcds.sh
@@ -127,9 +127,9 @@ exit_flag=0
echo
cold_run_time_threshold=${cold_run_time_threshold_master:-315000} # ms
hot_run_time_threshold=${hot_run_time_threshold_master:-190000} # ms
- if [[ "${target_branch}" == "branch-2.0" ]]; then
- cold_run_time_threshold=${cold_run_time_threshold_branch20:-370000} #
ms
- hot_run_time_threshold=${hot_run_time_threshold_branch20:-260000} #
ms
+ if [[ "${target_branch}" == "branch-4.0" ]]; then
+ cold_run_time_threshold=${cold_run_time_threshold_branch40:-370000} #
ms
+ hot_run_time_threshold=${hot_run_time_threshold_branch40:-260000} #
ms
elif [[ "${target_branch}" == "branch-3.1" ]]; then
cold_run_time_threshold=${cold_run_time_threshold_branch31:-315000} #
ms
hot_run_time_threshold=${hot_run_time_threshold_branch31:-190000} #
ms
diff --git a/regression-test/pipeline/performance/run-tpch.sh
b/regression-test/pipeline/performance/run-tpch.sh
index 120b5e91ada..d5aed991db6 100644
--- a/regression-test/pipeline/performance/run-tpch.sh
+++ b/regression-test/pipeline/performance/run-tpch.sh
@@ -119,9 +119,9 @@ exit_flag=0
echo
cold_run_time_threshold=${cold_run_time_threshold_master:-120000} # ms
hot_run_time_threshold=${hot_run_time_threshold_master:-42000} # ms
- if [[ "${target_branch}" == "branch-2.0" ]]; then
- cold_run_time_threshold=${cold_run_time_threshold_branch20:-130000} #
ms
- hot_run_time_threshold=${hot_run_time_threshold_branch20:-55000} #
ms
+ if [[ "${target_branch}" == "branch-4.0" ]]; then
+ cold_run_time_threshold=${cold_run_time_threshold_branch40:-120000} #
ms
+ hot_run_time_threshold=${hot_run_time_threshold_branch40:-42000} #
ms
elif [[ "${target_branch}" == "branch-3.1" ]]; then
cold_run_time_threshold=${cold_run_time_threshold_branch31:-120000} #
ms
hot_run_time_threshold=${hot_run_time_threshold_branch31:-42000} #
ms
diff --git a/regression-test/pipeline/vault_p0/prepare.sh
b/regression-test/pipeline/vault_p0/prepare.sh
index 7be2aaee1b1..93fc09dbb50 100644
--- a/regression-test/pipeline/vault_p0/prepare.sh
+++ b/regression-test/pipeline/vault_p0/prepare.sh
@@ -67,11 +67,11 @@ 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" || "${target_branch}" == "branch-3.1" ||
"${target_branch}" == "branch-3.0" ]]; then
+if [[ "${target_branch}" == "master" || "${target_branch}" == "branch-4.0" ||
"${target_branch}" == "branch-3.1" || "${target_branch}" == "branch-3.0" ]];
then
echo "INFO: PR target branch ${target_branch}"
install_java
else
- echo "WARNING: PR target branch ${target_branch} is NOT in (master,
branch-3.1, branch-3.0), skip pipeline."
+ echo "WARNING: PR target branch ${target_branch} is NOT in (master,
branch-4.0, branch-3.1, branch-3.0), skip pipeline."
bash
"${teamcity_build_checkoutDir}"/regression-test/pipeline/common/get-or-set-tmp-env.sh
'set' "export skip_pipeline=true"
exit 0
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
