branch-4.0: [ci](branch-4.0) adjust pipeline for 4.0 #56296 (#56386)

Cherry-picked from #56296

Co-authored-by: Dongyang Li <[email protected]>

Author: github-actions[bot]

.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

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'

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

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

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}    # 单位 秒

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

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

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

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