chore: rename services to match load testing environment

Informatievlaanderen · Sep 5, 2024 · 2e08e89 · 2e08e89
1 parent 34c23b2
commit 2e08e89
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 26 deletions.
diff --git 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
@@ -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
diff --git a/load-testing/workbench/.gitignore b/load-testing/workbench/.gitignore
diff --git a/load-testing/workbench/fetch.1000mpp.jmx b/load-testing/workbench/fetch.1000mpp.jmx
@@ -43,7 +43,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/fetch.100mpp.jmx b/load-testing/workbench/fetch.100mpp.jmx
@@ -43,7 +43,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/fetch.10mpp.jmx b/load-testing/workbench/fetch.10mpp.jmx
@@ -44,7 +44,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/fetch.250mpp.jmx b/load-testing/workbench/fetch.250mpp.jmx
@@ -43,7 +43,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/fetch.25mpp.jmx b/load-testing/workbench/fetch.25mpp.jmx
@@ -44,7 +44,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/fetch.500mpp.jmx b/load-testing/workbench/fetch.500mpp.jmx
@@ -43,7 +43,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/fetch.50mpp.jmx b/load-testing/workbench/fetch.50mpp.jmx
@@ -43,7 +43,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.desc">only the hostname, typically localhost or ldes-server</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>

diff --git a/load-testing/workbench/ingest.throughput.L-01T.jmx b/load-testing/workbench/ingest.throughput.L-01T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.L-02T.jmx b/load-testing/workbench/ingest.throughput.L-02T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.L-04T.jmx b/load-testing/workbench/ingest.throughput.L-04T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.L-08T.jmx b/load-testing/workbench/ingest.throughput.L-08T.jmx
@@ -55,7 +55,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.M-01T.jmx b/load-testing/workbench/ingest.throughput.M-01T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.M-02T.jmx b/load-testing/workbench/ingest.throughput.M-02T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.M-04T.jmx b/load-testing/workbench/ingest.throughput.M-04T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.M-08T.jmx b/load-testing/workbench/ingest.throughput.M-08T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.S-01T.jmx b/load-testing/workbench/ingest.throughput.S-01T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.S-02T.jmx b/load-testing/workbench/ingest.throughput.S-02T.jmx
@@ -54,7 +54,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.S-04T.jmx b/load-testing/workbench/ingest.throughput.S-04T.jmx
@@ -55,7 +55,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">

diff --git a/load-testing/workbench/ingest.throughput.S-08T.jmx b/load-testing/workbench/ingest.throughput.S-08T.jmx
@@ -45,7 +45,7 @@
           </elementProp>
           <elementProp name="hostname" elementType="Argument">
             <stringProp name="Argument.name">hostname</stringProp>
-            <stringProp name="Argument.value">ldio-workbench</stringProp>
+            <stringProp name="Argument.value">load-testing-ldio-workbench-workbench</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="port" elementType="Argument">
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ tests/** @@
     temp/**
     jmeter.log
     database
+    tmp