docker: use configs from clickhouse-test (#5531)

* CLICKHOUSE-3887 Debian init: Service stop timeout

* clean

* clean

* docker: use configs from clickhouse-test

* clean

dbms/tests/CMakeLists.txt

@@ -9,7 +9,7 @@ endif ()
 
 install (PROGRAMS clickhouse-test clickhouse-test-server DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
 install (
-    DIRECTORY queries performance
+    DIRECTORY queries performance config
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test
     USE_SOURCE_PERMISSIONS
     COMPONENT clickhouse

dbms/tests/decimals_dictionary.xml

@@ -1 +1 @@
-../../docker/test/stateless/decimals_dictionary.xml
+../../dbms/tests/config/decimals_dictionary.xml

dbms/tests/ints_dictionary.xml

@@ -1 +1 @@
-../../docker/test/stateless/ints_dictionary.xml
+../../dbms/tests/config/ints_dictionary.xml

dbms/tests/strings_dictionary.xml

@@ -1 +1 @@
-../../docker/test/stateless/strings_dictionary.xml
+../../dbms/tests/config/strings_dictionary.xml

docker/test/stateless/Dockerfile

@@ -30,20 +30,20 @@ RUN apt-get update -y \
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY zookeeper.xml /etc/clickhouse-server/config.d/zookeeper.xml
-COPY listen.xml /etc/clickhouse-server/config.d/listen.xml
-COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml
-COPY log_queries.xml /etc/clickhouse-server/users.d/log_queries.xml
-COPY readonly.xml /etc/clickhouse-server/users.d/readonly.xml
-COPY ints_dictionary.xml /etc/clickhouse-server/ints_dictionary.xml
-COPY strings_dictionary.xml /etc/clickhouse-server/strings_dictionary.xml
-COPY decimals_dictionary.xml /etc/clickhouse-server/decimals_dictionary.xml
 
 CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
     dpkg -i package_folder/clickhouse-common-static-dbg_*.deb; \
     dpkg -i package_folder/clickhouse-server_*.deb;  \
     dpkg -i package_folder/clickhouse-client_*.deb; \
     dpkg -i package_folder/clickhouse-test_*.deb; \
+    ln -s /usr/share/clickhouse-test/config/zookeeper.xml /etc/clickhouse-server/config.d/; \
+    ln -s /usr/share/clickhouse-test/config/listen.xml /etc/clickhouse-server/config.d/; \
+    ln -s /usr/share/clickhouse-test/config/part_log.xml /etc/clickhouse-server/config.d/; \
+    ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/; \
+    ln -s /usr/share/clickhouse-test/config/readonly.xml /etc/clickhouse-server/users.d/; \
+    ln -s /usr/share/clickhouse-test/config/ints_dictionary.xml /etc/clickhouse-server/; \
+    ln -s /usr/share/clickhouse-test/config/strings_dictionary.xml /etc/clickhouse-server/; \
+    ln -s /usr/share/clickhouse-test/config/decimals_dictionary.xml /etc/clickhouse-server/; \
     ln -s /usr/lib/llvm-8/bin/llvm-symbolizer /usr/bin/llvm-symbolizer; \
     echo "TSAN_OPTIONS='halt_on_error=1 history_size=7'" >> /etc/environment; \
     echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \

docker/test/stateless/listen.xml

@@ -1 +0,0 @@
-<yandex><listen_host>::</listen_host></yandex>

docker/test/stateless/log_queries.xml

@@ -1,7 +0,0 @@
-<yandex>
-    <profiles>
-        <default>
-            <log_queries>1</log_queries>
-        </default>
-    </profiles>
-</yandex>

docker/test/stateless/part_log.xml

@@ -1,8 +0,0 @@
-<yandex>
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </part_log>
-</yandex>

docker/test/stateless/zookeeper.xml

@@ -1,16 +0,0 @@
-<yandex>
-    <zookeeper>
-        <node>
-            <host>localhost</host>
-            <port>2181</port>
-        </node>
-        <node>
-            <host>yandex.ru</host>
-            <port>2181</port>
-        </node>
-        <node>
-            <host>111.0.1.2</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-</yandex>

docker/test/stress/Dockerfile

@@ -23,14 +23,14 @@ RUN apt-get update -y \
 
 
 COPY ./stress /stress
-COPY log_queries.xml /etc/clickhouse-server/users.d/log_queries.xml
-COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml
 
 CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
     dpkg -i package_folder/clickhouse-common-static-dbg_*.deb; \
     dpkg -i package_folder/clickhouse-server_*.deb;  \
     dpkg -i package_folder/clickhouse-client_*.deb; \
     dpkg -i package_folder/clickhouse-test_*.deb; \
+    ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/; \
+    ln -s /usr/share/clickhouse-test/config/part_log.xml /etc/clickhouse-server/config.d/; \
     ln -s /usr/lib/llvm-8/bin/llvm-symbolizer /usr/bin/llvm-symbolizer; \
     echo "TSAN_OPTIONS='halt_on_error=1 history_size=7'" >> /etc/environment; \
     echo "TSAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer" >> /etc/environment; \

docker/test/stress/log_queries.xml

@@ -1,7 +0,0 @@
-<yandex>
-    <profiles>
-        <default>
-            <log_queries>1</log_queries>
-        </default>
-    </profiles>
-</yandex>

docker/test/stress/part_log.xml

@@ -1,8 +0,0 @@
-<yandex>
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </part_log>
-</yandex>