From 4e5ca0e0ba51b0da3495302cbf6551a65fc0663e Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 17 Jan 2019 13:34:50 +0300
Subject: [PATCH] Better test images (with ts in output)

---
 docker/test/stateless/Dockerfile | 5 +++--
 docker/test/stress/Dockerfile    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index a5e2a88cd2..9faf98bf06 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -18,7 +18,8 @@ RUN apt-get update -y \
             sudo \
             openssl \
             netcat-openbsd \
-            telnet
+            telnet \
+            moreutils
 
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -39,4 +40,4 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
     echo "UBSAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \
     echo "LLVM_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \
     service zookeeper start; sleep 5; \
-    service clickhouse-server start && sleep 5 && clickhouse-test --shard --zookeeper $SKIP_TESTS_OPTION 2>&1 | tee test_output/test_result.txt
+    service clickhouse-server start && sleep 5 && clickhouse-test --shard --zookeeper $SKIP_TESTS_OPTION 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index 17f5eda798..f4f4b71ddc 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.10
+FROM yandex/clickhouse-deb-builder
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
-- 
GitLab