Style fix

2021-04-07 14:24:22 +03:00 · 2021-04-07 14:24:22 +03:00 · c6068d7c50
parent 3cf50b5f0a
commit c6068d7c50
3 changed files with 94 additions and 96 deletions
--- a/tests/testflows/datetime64_extended_range/docker-compose/clickhouse-service.yml
+++ b/tests/testflows/datetime64_extended_range/docker-compose/clickhouse-service.yml
@ -1,28 +1,28 @@
 version: '2.3'
 services:
-  clickhouse:
+    clickhouse:
-    image: yandex/clickhouse-integration-test
+        image: yandex/clickhouse-integration-test
-    expose:
+        expose:
-      - "9000"
+            - "9000"
-      - "9009"
+            - "9009"
-      - "8123"
+            - "8123"
-    volumes:
+        volumes:
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d/:/etc/clickhouse-server/users.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d/:/etc/clickhouse-server/users.d"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
-      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
+            - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
-      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
+            - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
-    entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+        entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
-    healthcheck:
+        healthcheck:
-      test: clickhouse client --query='select 1'
+            test: clickhouse client --query='select 1'
-      interval: 3s
+            interval: 3s
-      timeout: 2s
+            timeout: 2s
-      retries: 40
+            retries: 40
-      start_period: 2s
+            start_period: 2s
-    cap_add:
+        cap_add:
-      - SYS_PTRACE
+            - SYS_PTRACE
-    security_opt:
+        security_opt:
-      - label:disable
+            - label:disable
--- a/tests/testflows/datetime64_extended_range/docker-compose/docker-compose.yml
+++ b/tests/testflows/datetime64_extended_range/docker-compose/docker-compose.yml
@ -1,63 +1,61 @@
 version: '2.3'
 services:
-  zookeeper:
+    zookeeper:
-    extends:
+        extends:
-      file: zookeeper-service.yml
+            file: zookeeper-service.yml
-      service: zookeeper
+            service: zookeeper
-  clickhouse1:
+    clickhouse1:
-    extends:
+        extends:
-      file: clickhouse-service.yml
+            file: clickhouse-service.yml
-      service: clickhouse
+            service: clickhouse
-    hostname: clickhouse1
+        hostname: clickhouse1
-    volumes:
+        volumes:
-      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
-      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d:/etc/clickhouse-server/config.d"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/users.d:/etc/clickhouse-server/users.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/users.d:/etc/clickhouse-server/users.d"
-    depends_on:
+        depends_on:
-      zookeeper:
+            zookeeper:
-        condition: service_healthy
+                condition: service_healthy
-  clickhouse2:
+    clickhouse2:
-    extends:
+        extends:
-      file: clickhouse-service.yml
+            file: clickhouse-service.yml
-      service: clickhouse
+            service: clickhouse
-    hostname: clickhouse2
+        hostname: clickhouse2
-    volumes:
+        volumes:
-      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
-      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d:/etc/clickhouse-server/config.d"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/users.d:/etc/clickhouse-server/users.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/users.d:/etc/clickhouse-server/users.d"
-    depends_on:
+        depends_on:
-      zookeeper:
+            zookeeper:
-        condition: service_healthy
+                condition: service_healthy
-  clickhouse3:
+    clickhouse3:
-    extends:
+        extends:
-      file: clickhouse-service.yml
+            file: clickhouse-service.yml
-      service: clickhouse
+            service: clickhouse
-    hostname: clickhouse3
+        hostname: clickhouse3
-    volumes:
+        volumes:
-      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
-      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d:/etc/clickhouse-server/config.d"
-      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/users.d:/etc/clickhouse-server/users.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/users.d:/etc/clickhouse-server/users.d"
-    depends_on:
+        depends_on:
-      zookeeper:
+            zookeeper:
-        condition: service_healthy
+                condition: service_healthy
-  # dummy service which does nothing, but allows to postpone 
+    all_services_ready:
-  # 'docker-compose up -d' till all dependecies will go healthy
+        image: hello-world
-  all_services_ready:
+        depends_on:
-    image: hello-world
+            clickhouse1:
-    depends_on:
+                condition: service_healthy
-      clickhouse1:
+            clickhouse2:
-        condition: service_healthy
+                condition: service_healthy
-      clickhouse2:
+            clickhouse3:
-        condition: service_healthy
+                condition: service_healthy
-      clickhouse3:
+            zookeeper:
-        condition: service_healthy
+                condition: service_healthy
      zookeeper:
        condition: service_healthy
--- a/tests/testflows/datetime64_extended_range/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/datetime64_extended_range/docker-compose/zookeeper-service.yml
@ -1,18 +1,18 @@
 version: '2.3'
 services:
-  zookeeper:
+    zookeeper:
-    image: zookeeper:3.4.12
+        image: zookeeper:3.4.12
-    expose:
+        expose:
-      - "2181"
+            - "2181"
-    environment:
+        environment:
-      ZOO_TICK_TIME: 500
+            ZOO_TICK_TIME: 500
-      ZOO_MY_ID: 1
+            ZOO_MY_ID: 1
-    healthcheck:
+        healthcheck:
-      test: echo stat | nc localhost 2181
+            test: echo stat | nc localhost 2181
-      interval: 3s
+            interval: 3s
-      timeout: 2s
+            timeout: 2s
-      retries: 5
+            retries: 5
-      start_period: 2s
+            start_period: 2s
-    security_opt:
+        security_opt:
-      - label:disable
+            - label:disable