diff --git a/packaging/smokeTest/test_smoking_selfhost.sh b/packaging/smokeTest/test_smoking_selfhost.sh old mode 100644 new mode 100755 index d8099dfaea..a25c5a6d90 --- a/packaging/smokeTest/test_smoking_selfhost.sh +++ b/packaging/smokeTest/test_smoking_selfhost.sh @@ -4,11 +4,13 @@ LOG_FILE="test_server.log" SUCCESS_FILE="success.txt" FAILED_FILE="failed.txt" +REPORT_FILE="report.txt" # Initialize/clear result files > "$SUCCESS_FILE" > "$FAILED_FILE" > "$LOG_FILE" +> "$REPORT_FILE" # Switch to the target directory TARGET_DIR="../../tests/system-test/" @@ -22,18 +24,17 @@ else exit 1 fi -# Define the Python commands to execute :case list +# Define the Python commands to execute commands=( "python3 ./test.py -f 2-query/join.py" + "python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3" "python3 ./test.py -f 1-insert/insert_column_value.py" "python3 ./test.py -f 2-query/primary_ts_base_5.py" "python3 ./test.py -f 2-query/case_when.py" "python3 ./test.py -f 2-query/partition_limit_interval.py" "python3 ./test.py -f 2-query/fill.py" - "python3 ./test.py -f query/query_basic.py -N 3" "python3 ./test.py -f 7-tmq/basic5.py" "python3 ./test.py -f 8-stream/stream_basic.py" - "python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3" ) # Counters @@ -45,6 +46,7 @@ fail_count=0 for cmd in "${commands[@]}" do echo "===== Executing Command: $cmd =====" | tee -a "$LOG_FILE" + # Execute the command and append output and errors to the log file eval "$cmd" >> "$LOG_FILE" 2>&1 exit_code=$? @@ -58,6 +60,7 @@ do echo "$cmd" >> "$FAILED_FILE" ((fail_count++)) fi + echo "" | tee -a "$LOG_FILE" # Add an empty line for separation done @@ -72,23 +75,31 @@ if [ $fail_count -ne 0 ]; then echo "The following commands failed:" | tee -a "$LOG_FILE" cat "$FAILED_FILE" | tee -a "$LOG_FILE" else - echo "All commands executed successfully." | tee -a "$LOG_FILE" + echo "All commands executed successfully. Deleting log and result files..." | tee -a "$LOG_FILE" + rm -f "$LOG_FILE" "$SUCCESS_FILE" "$FAILED_FILE" "$REPORT_FILE" + echo "Log and result files deleted." fi -# Optional: Generate a separate report file -echo "" > "report.txt" -echo "===== Test Report =====" >> "report.txt" -echo "Total Commands Executed: $total" >> "report.txt" -echo "Successful: $success_count" >> "report.txt" -echo "Failed: $fail_count" >> "report.txt" - +# Generate a separate report file if there are failed commands if [ $fail_count -ne 0 ]; then - echo "" >> "report.txt" - echo "The following commands failed:" >> "report.txt" - cat "$FAILED_FILE" >> "report.txt" + echo "" >> "$REPORT_FILE" + echo "===== Test Report =====" >> "$REPORT_FILE" + echo "Total Commands Executed: $total" >> "$REPORT_FILE" + echo "Successful: $success_count" >> "$REPORT_FILE" + echo "Failed: $fail_count" >> "$REPORT_FILE" + echo "" >> "$REPORT_FILE" + echo "The following commands failed:" >> "$REPORT_FILE" + cat "$FAILED_FILE" >> "$REPORT_FILE" else - echo "All commands executed successfully." >> "report.txt" + echo "===== Test Report =====" > "$REPORT_FILE" + echo "Total Commands Executed: $total" >> "$REPORT_FILE" + echo "Successful: $success_count" >> "$REPORT_FILE" + echo "Failed: $fail_count" >> "$REPORT_FILE" + echo "All commands executed successfully." >> "$REPORT_FILE" fi -echo "Detailed logs can be found in $LOG_FILE" -echo "Test report can be found in report.txt" \ No newline at end of file +# Print the absolute paths of the log and result files +echo "Detailed logs can be found in: $(realpath "$LOG_FILE")" +echo "Successful commands can be found in: $(realpath "$SUCCESS_FILE")" +echo "Failed commands can be found in: $(realpath "$FAILED_FILE")" +echo "Test report can be found in: $(realpath "$REPORT_FILE")" \ No newline at end of file diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh index 798d73d0f3..8a05769f40 100755 --- a/packaging/tools/makepkg.sh +++ b/packaging/tools/makepkg.sh @@ -97,6 +97,7 @@ else ${build_dir}/bin/${clientName} \ ${taostools_bin_files} \ ${build_dir}/bin/${clientName}adapter \ + ${build_dir}/bin/${clientName}keeper \ ${build_dir}/bin/udfd \ ${script_dir}/remove.sh \ ${script_dir}/set_core.sh \ @@ -138,10 +139,16 @@ mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configFile} ${install_dir}/cfg/${ if [ -f "${compile_dir}/test/cfg/${clientName}adapter.toml" ]; then cp ${compile_dir}/test/cfg/${clientName}adapter.toml ${install_dir}/cfg || : fi +if [ -f "${compile_dir}/test/cfg/${clientName}keeper.toml" ]; then + cp ${compile_dir}/test/cfg/${clientName}keeper.toml ${install_dir}/cfg || : +fi if [ -f "${compile_dir}/test/cfg/${clientName}adapter.service" ]; then cp ${compile_dir}/test/cfg/${clientName}adapter.service ${install_dir}/cfg || : fi +if [ -f "${compile_dir}/test/cfg/${clientName}keeper.service" ]; then + cp ${compile_dir}/test/cfg/${clientName}keeper.service ${install_dir}/cfg || : +fi if [ -f "${cfg_dir}/${serverName}.service" ]; then cp ${cfg_dir}/${serverName}.service ${install_dir}/cfg || : @@ -422,19 +429,19 @@ if [ "$exitcode" != "0" ]; then exit $exitcode fi -if [ -n "${taostools_bin_files}" ] && [ "$verMode" != "cloud" ]; then - wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!"|| echo "failed to download TDinsight.sh" - if [ "$osType" != "Darwin" ]; then - tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || : - else - tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" || : - rm -rf ${taostools_install_dir} ||: - fi - exitcode=$? - if [ "$exitcode" != "0" ]; then - echo "tar ${taostools_pkg_name}.tar.gz error !!!" - exit $exitcode - fi -fi +# if [ -n "${taostools_bin_files}" ] && [ "$verMode" != "cloud" ]; then +# wget https://github.com/taosdata/grafanaplugin/releases/latest/download/TDinsight.sh -O ${taostools_install_dir}/bin/TDinsight.sh && echo "TDinsight.sh downloaded!"|| echo "failed to download TDinsight.sh" +# if [ "$osType" != "Darwin" ]; then +# tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" --remove-files || : +# else +# tar -zcv -f "$(basename ${taostools_pkg_name}).tar.gz" "$(basename ${taostools_install_dir})" || : +# rm -rf ${taostools_install_dir} ||: +# fi +# exitcode=$? +# if [ "$exitcode" != "0" ]; then +# echo "tar ${taostools_pkg_name}.tar.gz error !!!" +# exit $exitcode +# fi +# fi cd ${curr_dir} diff --git a/tests/parallel_test/longtimeruning_cases.task b/tests/parallel_test/longtimeruning_cases.task new file mode 100644 index 0000000000..1ec234c266 --- /dev/null +++ b/tests/parallel_test/longtimeruning_cases.task @@ -0,0 +1,19 @@ +#Column Define +#caseID,rerunTimes,Run with Sanitizer,casePath,caseCommand +#NA,NA,y or n,script,./test.sh -f tsim/user/basic.sim + + +# system test +# +#,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/stream_multi_agg.py +#,,n,system-test,python3 ./test.py -f 8-stream/stream_basic.py + +# army-test +#,,y,army,./pytest.sh python3 ./test.py -f multi-level/mlevel_basic.py -N 3 -L 3 -D 2 + +#tsim test +#,,y,script,./test.sh -f tsim/query/timeline.sim + +#docs-examples test +#,,n,docs-examples-test,bash c.sh +