From a5c54291cc1a495ce7f3cd97d31855e1f58ac099 Mon Sep 17 00:00:00 2001 From: tw-kang Date: Fri, 10 Jan 2025 14:10:19 +0900 Subject: [PATCH 1/3] rewrite shell.conf for ci run --- CTP/conf/shell.conf | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/CTP/conf/shell.conf b/CTP/conf/shell.conf index 5b0c429ba..fe922f005 100644 --- a/CTP/conf/shell.conf +++ b/CTP/conf/shell.conf @@ -28,14 +28,20 @@ # default.ssh.port= # Define default parameters for all instance nodes to configure cubrid.conf # default.cubrid.= +default.cubrid.cubrid_port_id=1568 # Define default parameters for all instance nodes to configure the broker section in cubrid_broker.conf # default.brokercommon.= # Define default parameters for all instance nodes to configure the broker %query_editor section in cubrid_broker.conf # default.broker1.= +default.broker1.BROKER_PORT=10090 +default.broker1.APPL_SERVER_SHM_ID=10090 # Define default parameters for all instance nodes to configure the broker %BROKER1 section in cubrid_broker.conf # default.broker2.= +default.broker2.BROKER_PORT=13091 +default.broker2.APPL_SERVER_SHM_ID=13091 # Define default parameters for all instance nodes to configure cubrid_ha.conf # default.ha.= +default.ha.ha_port_id=19909 # Define default parameters for all instance nodes to configure cm.conf # default.cm.= @@ -66,11 +72,45 @@ # cubrid_download_url=http://127.0.0.1/download/CUBRID-10.1.0.6929-b049ba5-Linux.x86_64.sh # Define the path of test cases used for testing, it should be checked out on test node -scenario=${HOME}/cubrid-testcases/shell +scenario=${HOME}/cubrid-testcases-private-ex/shell +testcase_exclude_from_file=${HOME}/cubrid-testcases-private-ex/shell/config/daily_regression_test_excluded_list_linux.conf # Define the max retry count for the failed case, when the case testing is failed, CTP will repeat to execute the failed case, # and once it's PASS during retry process, CTP will stop retry and start to execute the next case. testcase_retry_num=0 # Define the max timeout time (unit: second) for each case -testcase_timeout_in_secs=7200 +testcase_timeout_in_secs=300 + +# When the test is interrupted and started again, we can choose whether to run it continuously or re-run it. +test_continue_yn=false + +#Whether update test cases before test +testcase_update_yn=true +testcase_git_branch=develop + +test_platform=linux +test_category=shell + +# If the macro is included in the case, it will be excluded from the test. +# For example, if 'LINUX_NOT_SUPPORTED' is included in the case, it will not be run in linux shell test. +testcase_exclude_by_macro=LINUX_NOT_SUPPORTED + +# Some times there is not enough disk space on the test machine, so we need to delete all the files under the test case path after the case is run. +delete_testcase_after_each_execution_yn=false +enable_check_disk_space_yn=false + +# set test result feed back type: file or database +feedback_type=file +#feedback_notice_qahome_url=http://192.168.1.86:8080/qaresult/shellImportAction.nhn?main_id= + +#git_user=cubridqa +#git_email=dl_cubridqa_bj_internal@navercorp.com +#git_pwd=GITPASSWORD + +#these parameters are used when feedback_type=database +#feedback_db_host=192.168.1.86 +#feedback_db_port=33080 +#feedback_db_name=qaresu +#feedback_db_user=dba +#feedback_db_pwd= From 1108f333d31660a53e5bf728ef030d61e52558a9 Mon Sep 17 00:00:00 2001 From: tw-kang Date: Fri, 10 Jan 2025 14:28:09 +0900 Subject: [PATCH 2/3] add duration time count. --- CTP/shell/init_path/init.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CTP/shell/init_path/init.sh b/CTP/shell/init_path/init.sh index f57fd25d7..1de9bec0f 100644 --- a/CTP/shell/init_path/init.sh +++ b/CTP/shell/init_path/init.sh @@ -34,7 +34,7 @@ begin_time=0 ## the end time for case end_time=0 #0: not count time 1: count time -need_count_time=0 +need_count_time=1 cubrid_major="" cubrid_minor="" IGNORE_TEST_PERFORMANCE="" @@ -637,16 +637,15 @@ function count_time duration=$(($end_time-$begin_time)) date_str=`date +"%Y-%m-%d"` time_str=`date +%H:%M:%S` - cur_pwd=`pwd` - echo $time_str----$cur_pwd---'time'=$duration >> ~/shell_cases_log/$date_str-time.log + echo $time_str----$cur_path--- time="$duration" >> ${cur_path}/$result_file if [ $duration -gt 7200 ]; then # 2hours - echo $time_str----$cur_pwd---$duration >> ~/shell_cases_log/$date_str-gt_2hours.log + echo $time_str----$cur_pwd--- over 2hour time="$duration" >> ${cur_path}/$result_file elif [ $duration -gt 3600 ]; then # 1hours - echo $time_str----$cur_pwd---$duration >> ~/shell_cases_log/$date_str-gt_1hours.log + echo $time_str----$cur_pwd--- over 1hour time="$duration" >> ${cur_path}/$result_file elif [ $duration -gt 1800 ]; then # 30minutes - echo $time_str----$cur_pwd---$duration >> ~/shell_cases_log/$date_str-gt_30minutes.log + echo $time_str----$cur_pwd--- over 30minutes time="$duration" >> ${cur_path}/$result_file elif [ $duration -gt 600 ]; then # 10minutes - echo $time_str----$cur_pwd---$duration >> ~/shell_cases_log/$date_str-gt_10minutes.log + echo $time_str----$cur_pwd--- over 10minutes time="$duration" >> ${cur_path}/$result_file fi } @@ -687,7 +686,7 @@ function init begin_time=`get_curr_second` date_str=`date +"%Y-%m-%d"` time_str=`date +%H:%M:%S` - echo $time_str----`pwd` >> ~/shell_cases_log/$date_str-time.log + echo $time_str----$cur_path---- test start >> ${cur_path}/$result_file fi cur_path=`pwd` From 186e631c10b4bad19611dbbafef786838bbd652a Mon Sep 17 00:00:00 2001 From: tw-kang Date: Fri, 10 Jan 2025 15:23:18 +0900 Subject: [PATCH 3/3] arrange logic order --- CTP/shell/init_path/init.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CTP/shell/init_path/init.sh b/CTP/shell/init_path/init.sh index 1de9bec0f..835a1ef8f 100644 --- a/CTP/shell/init_path/init.sh +++ b/CTP/shell/init_path/init.sh @@ -682,12 +682,6 @@ function get_language() function init { echo "[INFO] TEST START (`date`)" - if [ $need_count_time -eq 1 ]; then - begin_time=`get_curr_second` - date_str=`date +"%Y-%m-%d"` - time_str=`date +%H:%M:%S` - echo $time_str----$cur_path---- test start >> ${cur_path}/$result_file - fi cur_path=`pwd` cd $cur_path @@ -695,7 +689,14 @@ function init full_name=$0 answer_no=1 mode=$1 - + + if [ $need_count_time -eq 1 ]; then + begin_time=`get_curr_second` + date_str=`date +"%Y-%m-%d"` + time_str=`date +%H:%M:%S` + echo $time_str----$cur_path---- test start >> ${cur_path}/$result_file + fi + if [ "$OS" = "Windows_NT" ]; then export init_path=`cygpath "${init_path}"` export REAL_INIT_PATH=`cygpath -w "${init_path}"`