Merge pull request #29319 from ClickHouse/fasttest-tsv

Generate test_results.tsv for fasttest

docker/images.json

@@ -41,6 +41,12 @@
         "name": "clickhouse/pvs-test",
         "dependent": []
     },
+    "docker/test/util": {
+        "name": "clickhouse/test-util",
+        "dependent": [
+            "docker/test/base"
+        ]
+    },
     "docker/test/stateless": {
         "name": "clickhouse/stateless-test",
         "dependent": [

docker/test/base/Dockerfile

@@ -1,5 +1,5 @@
 # docker build -t clickhouse/test-base .
-FROM ubuntu:20.04
+FROM clickhouse/test-util
 
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 

docker/test/fasttest/Dockerfile

@@ -1,5 +1,5 @@
 #  docker build -t clickhouse/fasttest .
-FROM ubuntu:20.04
+FROM clickhouse/test-util
 
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 

docker/test/fasttest/run.sh

@@ -266,7 +266,7 @@ function run_tests
             --fast-tests-only --no-long --testname --shard --zookeeper \
             -- "$FASTTEST_FOCUS" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
-        | tee "$FASTTEST_OUTPUT/test_log.txt"
+        | tee "$FASTTEST_OUTPUT/test_result.txt"
 }
 
 case "$stage" in
@@ -315,6 +315,9 @@ case "$stage" in
     ;&
 "run_tests")
     run_tests
+    /process_functional_tests_result.py --in-results-dir "$FASTTEST_OUTPUT/" \
+        --out-results-file "$FASTTEST_OUTPUT/test_results.tsv" \
+        --out-status-file "$FASTTEST_OUTPUT/check_status.tsv" || echo -e "failure\tCannot parse results" > "$FASTTEST_OUTPUT/check_status.tsv"
     ;;
 *)
     echo "Unknown test stage '$stage'"

docker/test/stateless/Dockerfile

@@ -60,6 +60,5 @@ ENV MINIO_ROOT_USER="clickhouse"
 ENV MINIO_ROOT_PASSWORD="clickhouse"
 
 COPY run.sh /
-COPY process_functional_tests_result.py /
 COPY setup_minio.sh /
 CMD ["/bin/bash", "/run.sh"]

docker/test/util/Dockerfile

@@ -0,0 +1,4 @@
+# docker build -t clickhouse/test-util .
+
+FROM ubuntu:20.04
+COPY process_functional_tests_result.py /