Merge pull request #50 from Altinity/package-testing

Package testing

Author: strtgbb

.github/upload_results_to_database.py

@@ -37,7 +37,7 @@
     "test_attributes": {
         "clickhouse_version": "version",
         "clickhouse_package": "package",
-        "base_os": None,
+        "base_os": "base_os",
         "architecture": "arch",
         "keeper_package": "keeper_binary_path",
         "zookeeper_version": "zookeeper_version",

README.md

@@ -250,6 +250,10 @@ You can run tests locally by passing `--local` and `--clickhouse-binary-path` to
 * `--clickhouse-binary-path` specifies the path to the ClickHouse binary on the host machine that will be used during the regression
   run. You can also use a docker image that should have `docker://` prefix.
   For example, `--clickhouse-binary-path docker://clickhouse/clickhouse-server:22.3.6.5-alpine`
+* `--base-os` specifies a docker image to install ClickHouse into when `--clickhouse-binary-path` is not a docker image.
+  Supported distributions are `altinityinfra/clickhouse-regression-multiarch:2.0` (default), `ubuntu`, and `alpine`.
+  There is experimental support for `fedora` and `redhat/ubi9`.
+
 > [!NOTE]
 > You can pass the `-h` or `--help` argument to the `regression.py` to see a help message.
 >

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

@@ -1,4 +1,4 @@
-version: '2.3'
+version: "2.3"
 
 services:
   clickhouse-different-versions:
@@ -17,7 +17,4 @@ 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:-/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"
+      - "${CLICKHOUSE_SPECIFIC_BINARY:-/tmp/clickhouse-server_23.3.13.7.altinitytest}:/usr/bin/clickhouse_different_version/clickhouse"

alter/alter_env/clickhouse-service.yml

@@ -6,7 +6,6 @@ services:
       file: ../../docker-compose/clickhouse-service.yml
       service: clickhouse
     volumes:
-      - "${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"
@@ -16,5 +15,3 @@ 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_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"

alter/alter_env/docker-compose.yml

@@ -2,7 +2,6 @@ version: '2.3'
 
 volumes:
   data1-1:
-  bash-tools:
 
 services:
   zookeeper1:
@@ -24,13 +23,11 @@ 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"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
 
     depends_on:
       zookeeper1:
         condition: service_healthy
-      bash-tools:
-        condition: service_started
 
   clickhouse-different-versions:
     extends:
@@ -41,7 +38,7 @@ services:
       - "${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"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -55,7 +52,7 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -69,7 +66,7 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -93,7 +90,6 @@ services:
     ports:
       - "8080"
     tty: true
-    init: true
     depends_on:
       - proxy1
       - proxy2
@@ -137,7 +133,7 @@ services:
       file: ../../docker-compose/bash-tools.yml
       service: bash-tools
     volumes:
-      - bash-tools:/usr/bin
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
 
   # dummy service which does nothing, but allows to postpone
   # 'docker-compose up -d' till all dependencies will go healthy

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

@@ -1,4 +1,4 @@
-version: '2.3'
+version: "2.3"
 
 services:
   clickhouse-different-versions:
@@ -17,8 +17,4 @@ 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:-/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"
-
+      - "${CLICKHOUSE_SPECIFIC_BINARY:-/tmp/clickhouse-server_23.3.13.7.altinitytest}:/usr/bin/clickhouse_different_version/clickhouse"

alter/alter_env_arm64/clickhouse-service.yml

@@ -11,7 +11,6 @@ services:
       - "9009"
       - "8123"
     volumes:
-      - "${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"

alter/alter_env_arm64/docker-compose.yml

@@ -2,7 +2,6 @@ version: '2.3'
 
 volumes:
   data1-1:
-  bash-tools:
 
 services:
   zookeeper1:
@@ -24,8 +23,7 @@ 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"
-      - bash-tools:/usr/bin/bash-tools
-
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -41,7 +39,7 @@ services:
       - "${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"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -55,7 +53,7 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -69,7 +67,7 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
       - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
-      - bash-tools:/usr/bin/bash-tools
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
     depends_on:
       zookeeper1:
         condition: service_healthy
@@ -93,7 +91,6 @@ services:
     ports:
       - "8080"
     tty: true
-    init: true
     depends_on:
       - proxy1
       - proxy2
@@ -137,7 +134,7 @@ services:
       file: ../../docker-compose/bash-tools.yml
       service: bash-tools
     volumes:
-      - bash-tools:/usr/bin
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/share:/share"
 
   # dummy service which does nothing, but allows to postpone
   # 'docker-compose up -d' till all dependencies will go healthy

alter/table/attach_partition/corrupted_partitions.py

@@ -25,16 +25,20 @@
 def corrupt_parts_on_table_partition(self, table_name, parts, bits_to_corrupt=1500000):
     """Corrupt the selected part file."""
     node = self.context.node
+    bash_tools = self.context.cluster.node("bash-tools")
 
     with By(
         f"executing a corrupt_file script that will flip {bits_to_corrupt} bits on the {parts} part of the {table_name} table"
     ):
         for part in parts:
+            original_path = f"/var/lib/clickhouse/data/default/{table_name}/{part}/"
+            temp_path = f"/share/corrupt_files/{table_name}/{part}/"
+
             node.command(
-                "/usr/bin/bash-tools/python3 /usr/bin/corrupt_file "
-                f"/var/lib/clickhouse/data/default/{table_name}/{part}/data.bin {bits_to_corrupt}",
-                message="Corrupted",
+                f"mkdir -p {temp_path} && cp {original_path}data.bin {temp_path}"
             )
+            bash_tools.command(f"corrupt_file {temp_path}data.bin {bits_to_corrupt}")
+            node.command(f"cp {temp_path}data.bin {original_path}")
 
 
 @TestStep(When)
@@ -43,17 +47,23 @@ def corrupt_parts_on_table_partition_detached(
 ):
     """Corrupt the selected part file."""
     node = self.context.node
+    bash_tools = self.context.cluster.node("bash-tools")
 
     with By(
         f"executing a corrupt_file script that will flip {bits_to_corrupt} bits on the {parts} part of the {table_name} table"
     ):
-
+        node.command("mkdir -p /share/corrupt_files/" + table_name)
         for part in parts:
+            original_path = (
+                f"/var/lib/clickhouse/data/default/{table_name}/detached/{part}/"
+            )
+            temp_path = f"/share/corrupt_files/{table_name}/detached/{part}/"
+
             node.command(
-                "/usr/bin/bash-tools/python3 /usr/bin/corrupt_file "
-                f"/var/lib/clickhouse/data/default/{table_name}/detached/{part}/data.bin {bits_to_corrupt}",
-                message="Corrupted",
+                f"mkdir -p {temp_path} && cp {original_path}data.bin {temp_path}"
             )
+            bash_tools.command(f"corrupt_file {temp_path}data.bin {bits_to_corrupt}")
+            node.command(f"cp {temp_path}data.bin {original_path}")
 
 
 @TestCheck

alter/table/replace_partition/corrupted_partitions.py

@@ -16,16 +16,20 @@
 def corrupt_parts_on_table_partition(self, table_name, parts, bits_to_corrupt=1500000):
     """Corrupt the selected part file."""
     node = self.context.node
+    bash_tools = self.context.cluster.node("bash-tools")
 
     with By(
         f"executing a corrupt_file script that will flip {bits_to_corrupt} bits on the {parts} part of the {table_name} table"
     ):
         for part in parts:
+            original_path = f"/var/lib/clickhouse/data/default/{table_name}/{part}/"
+            temp_path = f"/share/corrupt_files/{table_name}/{part}/"
+
             node.command(
-                "/usr/bin/bash-tools/python3 /usr/bin/corrupt_file "
-                f"/var/lib/clickhouse/data/default/{table_name}/{part}/data.bin {bits_to_corrupt}",
-                message="Corrupted",
+                f"mkdir -p {temp_path} && cp {original_path}data.bin {temp_path}"
             )
+            bash_tools.command(f"corrupt_file {temp_path}data.bin {bits_to_corrupt}")
+            node.command(f"cp {temp_path}data.bin {original_path}")
 
 
 @TestCheck