From 2e08e892971da570500844954b0b0981aa5067f4 Mon Sep 17 00:00:00 2001 From: Ranko Orlic Date: Thu, 5 Sep 2024 19:34:05 +0200 Subject: [PATCH] chore: rename services to match load testing environment --- load-testing/.gitignore | 1 + load-testing/docker-compose.yml | 10 +++++----- load-testing/server/.gitignore | 1 - load-testing/workbench/.gitignore | 1 - load-testing/workbench/fetch.1000mpp.jmx | 2 +- load-testing/workbench/fetch.100mpp.jmx | 2 +- load-testing/workbench/fetch.10mpp.jmx | 2 +- load-testing/workbench/fetch.250mpp.jmx | 2 +- load-testing/workbench/fetch.25mpp.jmx | 2 +- load-testing/workbench/fetch.500mpp.jmx | 2 +- load-testing/workbench/fetch.50mpp.jmx | 2 +- load-testing/workbench/ingest.throughput.L-01T.jmx | 2 +- load-testing/workbench/ingest.throughput.L-02T.jmx | 2 +- load-testing/workbench/ingest.throughput.L-04T.jmx | 2 +- load-testing/workbench/ingest.throughput.L-08T.jmx | 2 +- load-testing/workbench/ingest.throughput.M-01T.jmx | 2 +- load-testing/workbench/ingest.throughput.M-02T.jmx | 2 +- load-testing/workbench/ingest.throughput.M-04T.jmx | 2 +- load-testing/workbench/ingest.throughput.M-08T.jmx | 2 +- load-testing/workbench/ingest.throughput.S-01T.jmx | 2 +- load-testing/workbench/ingest.throughput.S-02T.jmx | 2 +- load-testing/workbench/ingest.throughput.S-04T.jmx | 2 +- load-testing/workbench/ingest.throughput.S-08T.jmx | 2 +- 23 files changed, 25 insertions(+), 26 deletions(-) delete mode 100644 load-testing/server/.gitignore delete mode 100644 load-testing/workbench/.gitignore diff --git a/load-testing/.gitignore b/load-testing/.gitignore index 0dd16b6..7529bd4 100644 --- a/load-testing/.gitignore +++ b/load-testing/.gitignore @@ -2,3 +2,4 @@ tests/** temp/** jmeter.log database +tmp diff --git a/load-testing/docker-compose.yml b/load-testing/docker-compose.yml index 955787f..841411a 100644 --- a/load-testing/docker-compose.yml +++ b/load-testing/docker-compose.yml @@ -66,7 +66,7 @@ services: depends_on: ldes-server: condition: service_healthy - ldio-workbench: + load-testing-ldio-workbench-workbench: condition: service_healthy environment: - TEST_FOLDER_BASE=/home/node/jmeter-runner/tests @@ -88,7 +88,7 @@ services: cpus: '0.1' memory: '0.25GB' - ldio-workbench: + load-testing-ldio-workbench-workbench: container_name: performance_testing_ldio-workbench image: ghcr.io/informatievlaanderen/ldi-orchestrator:20240814211044 # image: ldes/ldi-orchestrator:${LDI_ORCHESTRATOR_TAG:-2.5.1-SNAPSHOT} @@ -100,7 +100,7 @@ services: - ./workbench/tmp/epsg:/tmp/Databases:rw - ./workbench/config.yml:/ldio/application.yml:ro healthcheck: - test: ["CMD", "wget", "-qO-", "http://ldio-workbench:8080/actuator/health"] + test: ["CMD", "wget", "-qO-", "http://load-testing-ldio-workbench-workbench:8080/actuator/health"] environment: - SIS_DATA=/tmp - JAVA_TOOL_OPTIONS=-XX:MaxRAMPercentage=90 -XX:MinRAMPercentage=50 @@ -110,7 +110,7 @@ services: resources: limits: cpus: '3.5' - memory: '15.0GB' + memory: '4.0GB' reservations: cpus: '0.10' memory: '0.25GB' @@ -142,7 +142,7 @@ services: # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.4.1-SNAPSHOT} # Geomobility # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.10.0-SNAPSHOT} # Telraam # image: ghcr.io/informatievlaanderen/ldes-server:20240405144556 - image: ghcr.io/informatievlaanderen/ldes-server:20240902140211 + image: ldes/ldes-server:${LDES_SERVER_TAG:-3.3.0-SNAPSHOT} # Telraam networks: - performance_testing ports: diff --git a/load-testing/server/.gitignore b/load-testing/server/.gitignore deleted file mode 100644 index a9a5aec..0000000 --- a/load-testing/server/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tmp diff --git a/load-testing/workbench/.gitignore b/load-testing/workbench/.gitignore deleted file mode 100644 index a9a5aec..0000000 --- a/load-testing/workbench/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tmp diff --git a/load-testing/workbench/fetch.1000mpp.jmx b/load-testing/workbench/fetch.1000mpp.jmx index bc6f7f1..68e6187 100644 --- a/load-testing/workbench/fetch.1000mpp.jmx +++ b/load-testing/workbench/fetch.1000mpp.jmx @@ -43,7 +43,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/fetch.100mpp.jmx b/load-testing/workbench/fetch.100mpp.jmx index cf6b471..a812f06 100644 --- a/load-testing/workbench/fetch.100mpp.jmx +++ b/load-testing/workbench/fetch.100mpp.jmx @@ -43,7 +43,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/fetch.10mpp.jmx b/load-testing/workbench/fetch.10mpp.jmx index e6ee4e2..092d57e 100644 --- a/load-testing/workbench/fetch.10mpp.jmx +++ b/load-testing/workbench/fetch.10mpp.jmx @@ -44,7 +44,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/fetch.250mpp.jmx b/load-testing/workbench/fetch.250mpp.jmx index 037a9c6..54161c4 100644 --- a/load-testing/workbench/fetch.250mpp.jmx +++ b/load-testing/workbench/fetch.250mpp.jmx @@ -43,7 +43,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/fetch.25mpp.jmx b/load-testing/workbench/fetch.25mpp.jmx index 11773c1..24bbd41 100644 --- a/load-testing/workbench/fetch.25mpp.jmx +++ b/load-testing/workbench/fetch.25mpp.jmx @@ -44,7 +44,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/fetch.500mpp.jmx b/load-testing/workbench/fetch.500mpp.jmx index 98f6436..8982d6d 100644 --- a/load-testing/workbench/fetch.500mpp.jmx +++ b/load-testing/workbench/fetch.500mpp.jmx @@ -43,7 +43,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/fetch.50mpp.jmx b/load-testing/workbench/fetch.50mpp.jmx index fdc5fca..87d7f65 100644 --- a/load-testing/workbench/fetch.50mpp.jmx +++ b/load-testing/workbench/fetch.50mpp.jmx @@ -43,7 +43,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench only the hostname, typically localhost or ldes-server = diff --git a/load-testing/workbench/ingest.throughput.L-01T.jmx b/load-testing/workbench/ingest.throughput.L-01T.jmx index bc0bd12..31bfdd6 100644 --- a/load-testing/workbench/ingest.throughput.L-01T.jmx +++ b/load-testing/workbench/ingest.throughput.L-01T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.L-02T.jmx b/load-testing/workbench/ingest.throughput.L-02T.jmx index 56eabcd..0230d6c 100644 --- a/load-testing/workbench/ingest.throughput.L-02T.jmx +++ b/load-testing/workbench/ingest.throughput.L-02T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.L-04T.jmx b/load-testing/workbench/ingest.throughput.L-04T.jmx index f029e25..f7a42a2 100644 --- a/load-testing/workbench/ingest.throughput.L-04T.jmx +++ b/load-testing/workbench/ingest.throughput.L-04T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.L-08T.jmx b/load-testing/workbench/ingest.throughput.L-08T.jmx index 7484b99..3a7f886 100644 --- a/load-testing/workbench/ingest.throughput.L-08T.jmx +++ b/load-testing/workbench/ingest.throughput.L-08T.jmx @@ -55,7 +55,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.M-01T.jmx b/load-testing/workbench/ingest.throughput.M-01T.jmx index ec22a70..aeb7410 100644 --- a/load-testing/workbench/ingest.throughput.M-01T.jmx +++ b/load-testing/workbench/ingest.throughput.M-01T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.M-02T.jmx b/load-testing/workbench/ingest.throughput.M-02T.jmx index 7534b2b..3f88468 100644 --- a/load-testing/workbench/ingest.throughput.M-02T.jmx +++ b/load-testing/workbench/ingest.throughput.M-02T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.M-04T.jmx b/load-testing/workbench/ingest.throughput.M-04T.jmx index 0ce2fbb..d74a5b3 100644 --- a/load-testing/workbench/ingest.throughput.M-04T.jmx +++ b/load-testing/workbench/ingest.throughput.M-04T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.M-08T.jmx b/load-testing/workbench/ingest.throughput.M-08T.jmx index bd36d58..ca5bee8 100644 --- a/load-testing/workbench/ingest.throughput.M-08T.jmx +++ b/load-testing/workbench/ingest.throughput.M-08T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.S-01T.jmx b/load-testing/workbench/ingest.throughput.S-01T.jmx index 5f54b8d..16e5a5d 100644 --- a/load-testing/workbench/ingest.throughput.S-01T.jmx +++ b/load-testing/workbench/ingest.throughput.S-01T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.S-02T.jmx b/load-testing/workbench/ingest.throughput.S-02T.jmx index 3049fcd..4f36fbb 100644 --- a/load-testing/workbench/ingest.throughput.S-02T.jmx +++ b/load-testing/workbench/ingest.throughput.S-02T.jmx @@ -54,7 +54,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.S-04T.jmx b/load-testing/workbench/ingest.throughput.S-04T.jmx index 0194c89..0cbb173 100644 --- a/load-testing/workbench/ingest.throughput.S-04T.jmx +++ b/load-testing/workbench/ingest.throughput.S-04T.jmx @@ -55,7 +55,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench = diff --git a/load-testing/workbench/ingest.throughput.S-08T.jmx b/load-testing/workbench/ingest.throughput.S-08T.jmx index fbf0366..a79f182 100644 --- a/load-testing/workbench/ingest.throughput.S-08T.jmx +++ b/load-testing/workbench/ingest.throughput.S-08T.jmx @@ -45,7 +45,7 @@ hostname - ldio-workbench + load-testing-ldio-workbench-workbench =