move more code

docker/test/split_build_smoke_test/Dockerfile

@@ -2,5 +2,6 @@
 FROM yandex/clickhouse-binary-builder
 
 COPY run.sh /run.sh
+COPY process_split_build_smoke_test_result.py /
 
 CMD /run.sh

docker/test/split_build_smoke_test/process_split_build_smoke_test_result.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+import os
+import logging
+import argparse
+import csv
+
+RESULT_LOG_NAME = "run.log"
+
+def process_result(result_folder):
+
+    status = "success"
+    description = 'Server started and responded'
+    summary = [("Smoke test", "OK")]
+    with open(os.path.join(result_folder, RESULT_LOG_NAME), 'r') as run_log:
+        lines = run_log.read().split('\n')
+        if not lines or lines[0].strip() != 'OK':
+            status = "failure"
+            logging.info("Lines is not ok: %s", str('\n'.join(lines)))
+            summary = [("Smoke test", "FAIL")]
+            description = 'Server failed to respond, see result in logs'
+
+    result_logs = []
+    server_log_path = os.path.join(result_folder, "clickhouse-server.log")
+    stderr_log_path = os.path.join(result_folder, "stderr.log")
+    client_stderr_log_path = os.path.join(result_folder, "clientstderr.log")
+
+    if os.path.exists(server_log_path):
+        result_logs.append(server_log_path)
+
+    if os.path.exists(stderr_log_path):
+        result_logs.append(stderr_log_path)
+
+    if os.path.exists(client_stderr_log_path):
+        result_logs.append(client_stderr_log_path)
+
+    return status, description, summary, result_logs
+
+
+def write_results(results_file, status_file, results, status):
+    with open(results_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerows(results)
+    with open(status_file, 'w') as f:
+        out = csv.writer(f, delimiter='\t')
+        out.writerow(status)
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
+    parser = argparse.ArgumentParser(description="ClickHouse script for parsing results of split build smoke test")
+    parser.add_argument("--in-results-dir", default='/test_output/')
+    parser.add_argument("--out-results-file", default='/test_output/test_results.tsv')
+    parser.add_argument("--out-status-file", default='/test_output/check_status.tsv')
+    args = parser.parse_args()
+
+    state, description, test_results, logs = process_result(args.in_results_dir)
+    logging.info("Result parsed")
+    status = (state, description)
+    write_results(args.out_results_file, args.out_status_file, test_results, status)
+    logging.info("Result written")

docker/test/split_build_smoke_test/run.sh

@@ -11,10 +11,11 @@ install_and_run_server() {
 run_client() {
     for i in {1..100}; do
         sleep 1
-        LD_LIBRARY_PATH=/unpacked /unpacked/clickhouse-client --query "select 'OK'" 2>/var/log/clickhouse-server/clientstderr.log && break
+        LD_LIBRARY_PATH=/unpacked /unpacked/clickhouse-client --query "select 'OK'" > /test_output/run.log 2>/var/log/clickhouse-server/clientstderr.log && break
         [[ $i == 100 ]] && echo 'FAIL'
     done
 }
 
 install_and_run_server
 run_client
+/process_split_build_smoke_test_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv

docker/test/sqlancer/run.sh

@@ -29,5 +29,5 @@ tail -n 1000 /var/log/clickhouse-server/stderr.log > /test_output/stderr.log
 tail -n 1000 /var/log/clickhouse-server/stdout.log > /test_output/stdout.log
 tail -n 1000 /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log
 
-./process_sqlancer_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+/process_sqlancer_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
 ls /test_output

docker/test/style/run.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-cd /ClickHouse/utils/check-style
+cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
 ./check-style -n              |& tee /test_output/style_output.txt
 ./check-typos                 |& tee /test_output/typos_output.txt
 ./check-whitespaces -n        |& tee /test_output/whitespaces_output.txt
 ./check-duplicate-includes.sh |& tee /test_output/duplicate_output.txt
 ./shellcheck-run.sh           |& tee /test_output/shellcheck_output.txt
-./process_style_check_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
+/process_style_check_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv