update alter for ARM

alter/alter_env/clickhouse-service-different-versions.yml

@@ -20,8 +20,8 @@ services:
       - "${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/users.xml:/etc/clickhouse-server/users.xml"
-      - "${CLICKHOUSE_SPECIFIC_BINARY}:/usr/bin/clickhouse"
-      - "${CLICKHOUSE_SPECIFIC_ODBC_BINARY}:/usr/bin/clickhouse-odbc-bridge"
+      - "${CLICKHOUSE_SPECIFIC_BINARY:-/tmp/clickhouse-server_23.3.13.7.altinitytest}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_SPECIFIC_ODBC_BINARY:-/tmp/clickhouse-server_23.3.13.7.altinitytest_odbc_bridge}:/usr/bin/clickhouse-odbc-bridge"
       - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse_main_version/clickhouse"
       - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse_main_version/clickhouse-odbc-bridge"
     entrypoint: bash -c "tail -f /dev/null"

alter/alter_env_arm64/Dockerfile

@@ -1,9 +1,4 @@
 FROM altinityinfra/clickhouse-regression-multiarch:1.0
 
-RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-
 RUN apt-get update
-RUN apt-get -y install postgresql
-
-RUN pip install pyarrow
+RUN pip install clickhouse-driver

alter/alter_env_arm64/clickhouse-service-different-versions.yml

@@ -0,0 +1,37 @@
+version: '2.3'
+
+services:
+  clickhouse-different-versions:
+    image: altinityinfra/clickhouse-regression-multiarch:1.0
+    init: true
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/../helpers/clickhouse-client-tty:/usr/bin/clickhouse-client-tty"
+      - "${CLICKHOUSE_TESTS_DIR}/../helpers/corrupt_file:/usr/bin/corrupt_file"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/ports.xml:/etc/clickhouse-server/config.d/ports.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/remote.xml:/etc/clickhouse-server/config.d/remote.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/ssl.xml:/etc/clickhouse-server/config.d/ssl.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/storage.xml:/etc/clickhouse-server/config.d/storage.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml"
+      - "${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/users.xml:/etc/clickhouse-server/users.xml"
+      - "${CLICKHOUSE_SPECIFIC_BINARY:-/tmp/clickhouse-server_23.3.13.7.altinitytest}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_SPECIFIC_ODBC_BINARY:-/tmp/clickhouse-server_23.3.13.7.altinitytest_odbc_bridge}:/usr/bin/clickhouse-odbc-bridge"
+      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse_main_version/clickhouse"
+      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse_main_version/clickhouse-odbc-bridge"
+    entrypoint: bash -c "tail -f /dev/null"
+    healthcheck:
+      test: echo 1
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable

alter/alter_env_arm64/clickhouse-service.yml

@@ -2,21 +2,23 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: altinityinfra/clickhouse-regression-multiarch:1.0
+    build:
+      context: .
+      dockerfile: Dockerfile
     init: true
     expose:
       - "9000"
       - "9009"
       - "8123"
     volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/../helpers/clickhouse-client-tty:/usr/bin/clickhouse-client-tty"
+      - "${CLICKHOUSE_TESTS_DIR}/../helpers/corrupt_file:/usr/bin/corrupt_file"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/logs.xml:/etc/clickhouse-server/config.d/logs.xml"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/ports.xml:/etc/clickhouse-server/config.d/ports.xml"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/remote.xml:/etc/clickhouse-server/config.d/remote.xml"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/ssl.xml:/etc/clickhouse-server/config.d/ssl.xml"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/storage.xml:/etc/clickhouse-server/config.d/storage.xml"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/zookeeper.xml:/etc/clickhouse-server/config.d/zookeeper.xml"
-      - "${CLICKHOUSE_TESTS_DIR}/data/clickhouse_table_def.txt:/var/lib/test_files/clickhouse_table_def.txt"
-      - "${CLICKHOUSE_TESTS_DIR}/data/generate_chunked_file.py:/var/lib/test_files/generate_chunked_file.py"
       - "${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/users.xml:/etc/clickhouse-server/users.xml"

alter/alter_env_arm64/docker-compose.yml

@@ -18,6 +18,20 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse-different-versions:
+    extends:
+      file: clickhouse-service-different-versions.yml
+      service: clickhouse-different-versions
+    hostname: clickhouse-different-versions
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse-different-versions/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse-different-versions/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse-different-versions/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
     depends_on:
       zookeeper:
         condition: service_healthy
@@ -116,6 +130,8 @@ services:
         condition: service_healthy
       clickhouse3:
         condition: service_healthy
+      clickhouse-different-versions:
+        condition: service_healthy
       zookeeper:
         condition: service_healthy
       mysql1: