This is an automated email from the ASF dual-hosted git repository. yiguolei 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 920c75c8709 [fix](ci)tpch pipeline add check (#28370) 920c75c8709 is described below commit 920c75c8709d8a9959db729be40eca73ea70e0a5 Author: Dongyang Li <hello_step...@qq.com> AuthorDate: Sat Dec 16 11:11:28 2023 +0800 [fix](ci)tpch pipeline add check (#28370) Co-authored-by: stephen <hello-step...@qq.com> --- regression-test/pipeline/common/github-utils.sh | 5 +---- regression-test/pipeline/tpch/tpch-sf100/run.sh | 26 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/regression-test/pipeline/common/github-utils.sh b/regression-test/pipeline/common/github-utils.sh index 63481d11734..8cb3cc81e65 100644 --- a/regression-test/pipeline/common/github-utils.sh +++ b/regression-test/pipeline/common/github-utils.sh @@ -53,13 +53,10 @@ function create_an_issue_comment_tpch() { local COMMENT_BODY="$2" local machine='aliyun_ecs.c7a.8xlarge_32C64G' COMMENT_BODY=" -<details> -<summary>TPC-H test result on machine: '${machine}'</summary> - +TPC-H test result on machine: '${machine}' \`\`\` ${COMMENT_BODY} \`\`\` -</details> " create_an_issue_comment "${ISSUE_NUMBER}" "${COMMENT_BODY}" } diff --git a/regression-test/pipeline/tpch/tpch-sf100/run.sh b/regression-test/pipeline/tpch/tpch-sf100/run.sh index dc029181241..b386fef3a21 100644 --- a/regression-test/pipeline/tpch/tpch-sf100/run.sh +++ b/regression-test/pipeline/tpch/tpch-sf100/run.sh @@ -50,6 +50,30 @@ echo "#### Run tpch-sf100 test on Doris ####" DORIS_HOME="${teamcity_build_checkoutDir}/output" exit_flag=0 +check_tpch_result() { + log_file="$1" + if ! grep '^Total cold run time' "${log_file}" || ! grep '^Total hot run time' "${log_file}"; then + echo "ERROR: can not find 'Total hot run time' in '${log_file}'" + return 1 + else + cold_run_time=$(grep '^Total cold run time' "${log_file}" | awk '{print $5}') + hot_run_time=$(grep '^Total hot run time' "${log_file}" | awk '{print $5}') + fi + # 单位是毫秒 + cold_run_time_threshold=${cold_run_time_threshold:-50000} + hot_run_time_threshold=${hot_run_time_threshold:-42000} + if [[ ${cold_run_time} -gt 50000 || ${hot_run_time} -gt 42000 ]]; then + echo "ERROR: + cold_run_time ${cold_run_time} is great than the threshold ${cold_run_time_threshold}, + or, hot_run_time ${hot_run_time} is great than the threshold ${hot_run_time_threshold}" + return 1 + else + echo "INFO: + cold_run_time ${cold_run_time} is less than the threshold ${cold_run_time_threshold}, + or, hot_run_time ${hot_run_time} is less than the threshold ${hot_run_time_threshold}" + fi +} + ( set -e shopt -s inherit_errexit @@ -104,7 +128,7 @@ exit_flag=0 set_session_variable runtime_filter_mode global sed -i "s|^SCALE_FACTOR=[0-9]\+$|SCALE_FACTOR=${SF}|g" "${teamcity_build_checkoutDir}"/tools/tpch-tools/bin/run-tpch-queries.sh bash "${teamcity_build_checkoutDir}"/tools/tpch-tools/bin/run-tpch-queries.sh | tee "${teamcity_build_checkoutDir}"/run-tpch-queries.log - if ! grep '^Total hot run time' "${teamcity_build_checkoutDir}"/run-tpch-queries.log >/dev/null; then exit 1; fi + if ! check_tpch_result "${teamcity_build_checkoutDir}"/run-tpch-queries.log; then exit 1; fi line_end=$(sed -n '/^Total hot run time/=' "${teamcity_build_checkoutDir}"/run-tpch-queries.log) line_begin=$((line_end - 23)) comment_body="Tpch sf${SF} test result on commit ${commit_id:-}, data reload: ${data_reload:-"false"} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org