Merge cd22560 into 26c9911

Author: vitalyisaev2

ydb/tests/fq/generic/clickhouse/init.sql renamed to ydb/tests/fq/generic/analytics/clickhouse/init.sql

@@ -14,7 +14,7 @@
 
 @pytest.fixture
 def settings() -> Settings:
-    return Settings.from_env()
+    return Settings.from_env(docker_compose_file_path='ydb/tests/fq/generic/analytics/docker-compose.yml')
 
 
 @pytest.fixture

ydb/tests/fq/generic/conftest.py renamed to ydb/tests/fq/generic/analytics/conftest.py

@@ -1,6 +1,6 @@
 services:
   clickhouse:
-    container_name: tests-fq-generic-clickhouse
+    container_name: tests-fq-generic-analytics-clickhouse
     environment:
       CLICKHOUSE_DB: db
       CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
@@ -16,14 +16,14 @@ services:
   fq-connector-go:
     command: |
       sh -c "
-        echo \"$$(dig tests-fq-generic-ydb +short) tests-fq-generic-ydb\" >> /etc/hosts; cat /etc/hosts;
+        echo \"$$(dig tests-fq-generic-analytics-ydb +short) tests-fq-generic-analytics-ydb\" >> /etc/hosts; cat /etc/hosts;
         /opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
-    container_name: tests-fq-generic-fq-connector-go
+    container_name: tests-fq-generic-analytics-fq-connector-go
     image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
     ports:
       - "2130"
   greenplum:
-    container_name: tests-fq-generic-greenplum
+    container_name: tests-fq-generic-analytics-greenplum
     image: ghcr.io/ydb-platform/fq-connector-go_greenplum:6.25.3-6432@sha256:9e862b05719b289b447562fbce6c003916a764a549f924a4175eecd7e7891a0b
     volumes:
       - ./greenplum/init_db.sh:/init_db.sh
@@ -33,7 +33,7 @@ services:
       - /var
   postgresql:
     command: -p 6432
-    container_name: tests-fq-generic-postgresql
+    container_name: tests-fq-generic-analytics-postgresql
     environment:
       POSTGRES_DB: db
       POSTGRES_PASSWORD: password
@@ -46,13 +46,13 @@ services:
       - /tmp
       - /var
   ydb:
-    container_name: tests-fq-generic-ydb
+    container_name: tests-fq-generic-analytics-ydb
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_USER: user
       YDB_DEFAULT_LOG_LEVEL: DEBUG
       DB_USE_IN_MEMORY_PDISKS: "true"
-    hostname: tests-fq-generic-ydb
+    hostname: tests-fq-generic-analytics-ydb
     image: ghcr.io/ydb-platform/local-ydb:latest@sha256:9045e00afec1923dc3277564c7b2f829087c2115f45f18e1d38b80bb89f98be6
     volumes:
       - ./ydb/init_ydb:/init_ydb