From 54e273f3cbdf883339938ba420b8636659ee6d8b Mon Sep 17 00:00:00 2001 From: Sergei Zobov Date: Tue, 3 Sep 2024 13:26:53 +0200 Subject: [PATCH] docker-compose.testing.yaml: re-use test-app-docker-compose.yaml --- .../docker-compose.testing.yaml | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml index 8d4564af31a..647ce80f1d1 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.testing.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.testing.yaml @@ -1,5 +1,8 @@ version: "2.4" +include: + - test-app-docker-compose.yaml + x-clickhouse-defaults: &clickhouse-defaults restart: on-failure # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab @@ -280,29 +283,3 @@ services: depends_on: - otel-collector restart: on-failure - - hotrod: - image: jaegertracing/example-hotrod:1.30 - container_name: hotrod - logging: - options: - max-size: 50m - max-file: "3" - command: [ "all" ] - environment: - - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces - - load-hotrod: - image: "signoz/locust:1.2.3" - container_name: load-hotrod - hostname: load-hotrod - environment: - ATTACKED_HOST: http://hotrod:8080 - LOCUST_MODE: standalone - NO_PROXY: standalone - TASK_DELAY_FROM: 5 - TASK_DELAY_TO: 30 - QUIET_MODE: "${QUIET_MODE:-false}" - LOCUST_OPTS: "--headless -u 10 -r 1" - volumes: - - ../common/locust-scripts:/locust