From a3d50b2eeaf2b41867de2a0af301e2e5769bc411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de> Date: Tue, 2 Mar 2021 11:52:48 +0100 Subject: [PATCH] Rearrange use case enumeration in Docker tests --- docker-test/uc2-docker-compose/docker-compose.yml | 13 +++++++------ docker-test/uc3-docker-compose/docker-compose.yml | 3 +-- docker-test/uc4-docker-compose/docker-compose.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker-test/uc2-docker-compose/docker-compose.yml b/docker-test/uc2-docker-compose/docker-compose.yml index 9f28af5dc..613553fcf 100755 --- a/docker-test/uc2-docker-compose/docker-compose.yml +++ b/docker-test/uc2-docker-compose/docker-compose.yml @@ -1,9 +1,10 @@ version: '2' services: zookeeper: + #image: wurstmeister/zookeeper image: confluentinc/cp-zookeeper - expose: - - "9092" + ports: + - "2181:2181" environment: ZOOKEEPER_CLIENT_PORT: 2181 kafka: @@ -24,10 +25,10 @@ services: depends_on: - zookeeper - kafka + #ports: + # - "8081:8081" expose: - "8081" - #ports: - # - 8081:8081 environment: SCHEMA_REGISTRY_HOST_NAME: schema-registry SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' @@ -39,6 +40,7 @@ services: environment: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 + KAFKA_WINDOW_DURATION_MINUTES: 60 uc-wg: image: theodolite/theodolite-uc2-workload-generator:latest depends_on: @@ -49,5 +51,4 @@ services: PORT: 5701 KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 - NUM_SENSORS: 4 - NUM_NESTED_GROUPS: 4 \ No newline at end of file + NUM_SENSORS: 10 diff --git a/docker-test/uc3-docker-compose/docker-compose.yml b/docker-test/uc3-docker-compose/docker-compose.yml index 642a0fbb8..d321318b4 100755 --- a/docker-test/uc3-docker-compose/docker-compose.yml +++ b/docker-test/uc3-docker-compose/docker-compose.yml @@ -40,7 +40,6 @@ services: environment: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 - KAFKA_WINDOW_DURATION_MINUTES: 60 uc-wg: image: theodolite/theodolite-uc3-workload-generator:latest depends_on: @@ -51,4 +50,4 @@ services: PORT: 5701 KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 - NUM_SENSORS: 10 \ No newline at end of file + NUM_SENSORS: 10 diff --git a/docker-test/uc4-docker-compose/docker-compose.yml b/docker-test/uc4-docker-compose/docker-compose.yml index 55b9f60b8..d478d74e5 100755 --- a/docker-test/uc4-docker-compose/docker-compose.yml +++ b/docker-test/uc4-docker-compose/docker-compose.yml @@ -1,10 +1,9 @@ version: '2' services: zookeeper: - #image: wurstmeister/zookeeper image: confluentinc/cp-zookeeper - ports: - - "2181:2181" + expose: + - "2181" environment: ZOOKEEPER_CLIENT_PORT: 2181 kafka: @@ -25,10 +24,10 @@ services: depends_on: - zookeeper - kafka - #ports: - # - "8081:8081" expose: - "8081" + #ports: + # - 8081:8081 environment: SCHEMA_REGISTRY_HOST_NAME: schema-registry SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' @@ -50,4 +49,5 @@ services: PORT: 5701 KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 - NUM_SENSORS: 10 + NUM_SENSORS: 4 + NUM_NESTED_GROUPS: 4 \ No newline at end of file -- GitLab