update dns suite for package testing

Author: strtgbb

dns/dns_env/Dockerfile

@@ -1,10 +1,10 @@
-version: '3'
+version: "3"
 
 services:
   clickhouse:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    extends:
+      file: ../../docker-compose/clickhouse-service.yml
+      service: clickhouse
     init: true
     expose:
       - "9000"
@@ -14,7 +14,6 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/docker_related_config.xml:/etc/clickhouse-server/config.d/docker_related_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_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
     entrypoint: bash -c "tail -f /dev/null"
     healthcheck:
       test: echo 1

dns/dns_env/clickhouse-service.yml

@@ -40,4 +40,4 @@ services:
     image: coredns/coredns:latest
     volumes:
     - "${CLICKHOUSE_TESTS_DIR}/tests/lookup/example.com:/etc/example.com"
-    - "${CLICKHOUSE_TESTS_DIR}/tests/lookup/Corefile:/Corefile"
+    - "${CLICKHOUSE_TESTS_DIR}/tests/lookup/Corefile:/Corefile"

dns/dns_env/docker-compose.yml

@@ -1,10 +1,10 @@
-version: '3'
+version: "3"
 
 services:
   clickhouse:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    extends:
+      file: ../../docker-compose/clickhouse-service.yml
+      service: clickhouse
     init: true
     expose:
       - "9000"
@@ -14,7 +14,6 @@ services:
       - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d/docker_related_config.xml:/etc/clickhouse-server/config.d/docker_related_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_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
     entrypoint: bash -c "tail -f /dev/null"
     healthcheck:
       test: echo 1

dns/dns_env_arm64/Dockerfile

@@ -39,10 +39,20 @@ def scenario(self):
         )
         CLIENT_IP = cluster.command(None, query).output
 
-    with And("I am listening in the background to port 8123 and 53"):
-        cluster.node("clickhouse1").command(
-            "tcpdump -i any -w http_and_dns.pcap port 8123 or port 53 &"
-        )
+    with And("I try to install tcpdump"):
+        tcpdump_available = False
+        r = cluster.node("clickhouse1").command("apt-get update", no_checks=True)
+        if r.exitcode == 0:
+            cluster.node("clickhouse1").command(
+                "apt-get install -y bind9-dnsutils tcpdump curl psmisc less"
+            )
+            tcpdump_available = True
+
+    if tcpdump_available:
+        with And("I am listening in the background to port 8123 and 53"):
+            cluster.node("clickhouse1").command(
+                "tcpdump -i any -w http_and_dns.pcap port 8123 or port 53 &"
+            )
 
     with When("I write the CLIENT IP into example.com"):
         cluster.command(
@@ -68,16 +78,17 @@ def scenario(self):
         server_version = cluster.node("clickhouse1").query(f"SELECT version()").output
         assert client_version == server_version, error()
 
-    with When("I kill the background port listening"):
-        cluster.node("clickhouse1").command("killall tcpdump")
+    if tcpdump_available:
+        with When("I kill the background port listening"):
+            cluster.node("clickhouse1").command("killall tcpdump")
 
-    with And("I copy the http_and_dns.pcap file off of the docker container"):
-        x = cluster.command(
-            None, "docker ps | grep clickhouse1 | head -n 1 | cut -d ' ' -f 1"
-        ).output
-        cluster.command(
-            None, f"docker cp {x}:/http_and_dns.pcap regression/dns/tests/lookup/"
-        )
+        with And("I copy the http_and_dns.pcap file off of the docker container"):
+            x = cluster.command(
+                None, "docker ps | grep clickhouse1 | head -n 1 | cut -d ' ' -f 1"
+            ).output
+            cluster.command(
+                None, f"docker cp {x}:/http_and_dns.pcap regression/dns/tests/lookup/"
+            )
 
     with And("I update example.com with more urls."):
         cluster.command(