From 66163955f17ea587a43acfd6e674f1e984d5d583 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Tue, 23 Nov 2021 12:07:29 +0100
Subject: [PATCH] fix resources path in benchmark definitions

---
 .../uc1-flink-benchmark-operator.yaml          | 18 +++++++++---------
 .../uc1-kstreams/uc1-benchmark-operator.yaml   | 12 ++++++------
 .../uc1-kstreams/uc1-benchmark-standalone.yaml | 12 ++++++------
 .../uc2-flink-benchmark-operator.yaml          | 18 +++++++++---------
 .../uc2-kstreams/uc2-benchmark-operator.yaml   | 12 ++++++------
 .../uc2-kstreams/uc2-benchmark-standalone.yaml | 12 ++++++------
 .../uc3-flink-benchmark-operator.yaml          | 18 +++++++++---------
 .../uc3-kstreams/uc3-benchmark-operator.yaml   | 12 ++++++------
 .../uc3-kstreams/uc3-benchmark-standalone.yaml | 12 ++++++------
 .../uc4-flink-benchmark-operator.yaml          | 18 +++++++++---------
 .../uc4-kstreams/uc4-benchmark-operator.yaml   | 12 ++++++------
 .../uc4-kstreams/uc4-benchmark-standalone.yaml | 12 ++++++------
 12 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
index 686a98a77..fb985d457 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-flink"
           files:
-          - "uc1-flink/flink-configuration-configmap.yaml"
-          - "uc1-flink/taskmanager-deployment.yaml"
-          - "uc1-flink/taskmanager-service.yaml"
-          - "uc1-flink/service-monitor.yaml"
-          - "uc1-flink/jobmanager-service.yaml"
-          - "uc1-flink/jobmanager-deployment.yaml"
-          #- "uc1-flink/jobmanager-rest-service.yaml"
+          - "flink-configuration-configmap.yaml"
+          - "taskmanager-deployment.yaml"
+          - "taskmanager-service.yaml"
+          - "service-monitor.yaml"
+          - "jobmanager-service.yaml"
+          - "jobmanager-deployment.yaml"
+          #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc1-loadgen"
           files:
-          - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-          - "uc1-kstreams/uc1-load-generator-service.yaml"
+          - "uc1-load-generator-deployment.yaml"
+          - "uc1-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
index 0fb630107..3532e5d8c 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
       - configMap:
           name: "benchmark-resources-uc1-kstreams"
           files:
-          - "uc1-kstreams/uc1-kstreams-deployment.yaml"
-          - "uc1-kstreams/uc1-kstreams-service.yaml"
-          - "uc1-kstreams/uc1-jmx-configmap.yaml"
-          - "uc1-kstreams/uc1-service-monitor.yaml"
+          - "uc1-kstreams-deployment.yaml"
+          - "uc1-kstreams-service.yaml"
+          - "uc1-jmx-configmap.yaml"
+          - "uc1-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc1-loadgen"
           files:
-          - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-          - "uc1-kstreams/uc1-load-generator-service.yaml"
+          - "uc1-load-generator-deployment.yaml"
+          - "uc1-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
index d0ef1bbc8..58f6d89d6 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc1-kstreams"
         files:
-        - "uc1-kstreams/uc1-kstreams-deployment.yaml"
-        - "uc1-kstreams/uc1-kstreams-service.yaml"
-        - "uc1-kstreams/uc1-jmx-configmap.yaml"
-        - "uc1-kstreams/uc1-service-monitor.yaml"
+        - "uc1-kstreams-deployment.yaml"
+        - "uc1-kstreams-service.yaml"
+        - "uc1-jmx-configmap.yaml"
+        - "uc1-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc1-loadgen"
         files:
-        - "uc1-kstreams/uc1-load-generator-deployment.yaml"
-        - "uc1-kstreams/uc1-load-generator-service.yaml"
+        - "uc1-load-generator-deployment.yaml"
+        - "uc1-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
index c838fb098..d87d7575b 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc2-flink"
           files:
-          - "uc2-flink/flink-configuration-configmap.yaml"
-          - "uc2-flink/taskmanager-deployment.yaml"
-          - "uc2-flink/taskmanager-service.yaml"
-          - "uc2-flink/service-monitor.yaml"
-          - "uc2-flink/jobmanager-service.yaml"
-          - "uc2-flink/jobmanager-deployment.yaml"
-          #- "uc2-flink/jobmanager-rest-service.yaml"
+          - "flink-configuration-configmap.yaml"
+          - "taskmanager-deployment.yaml"
+          - "taskmanager-service.yaml"
+          - "service-monitor.yaml"
+          - "jobmanager-service.yaml"
+          - "jobmanager-deployment.yaml"
+          #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc2-loadgen"
           files:
-            - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-            - "uc2-kstreams/uc2-load-generator-service.yaml"
+            - "uc2-load-generator-deployment.yaml"
+            - "uc2-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
index e94cce184..302fe6b25 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
     - configMap:
         name: "benchmark-resources-uc2-kstreams"
         files:
-          - "uc2-kstreams/uc2-kstreams-deployment.yaml"
-          - "uc2-kstreams/uc2-kstreams-service.yaml"
-          - "uc2-kstreams/uc2-jmx-configmap.yaml"
-          - "uc2-kstreams/uc2-service-monitor.yaml"
+          - "uc2-kstreams-deployment.yaml"
+          - "uc2-kstreams-service.yaml"
+          - "uc2-jmx-configmap.yaml"
+          - "uc2-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc2-loadgen"
           files:
-            - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-            - "uc2-kstreams/uc2-load-generator-service.yaml"
+            - "uc2-load-generator-deployment.yaml"
+            - "uc2-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
index f9e5e2c17..d70c4669f 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc2-kstreams"
         files:
-          - "uc2-kstreams/uc2-kstreams-deployment.yaml"
-          - "uc2-kstreams/uc2-kstreams-service.yaml"
-          - "uc2-kstreams/uc2-jmx-configmap.yaml"
-          - "uc2-kstreams/uc2-service-monitor.yaml"
+          - "uc2-kstreams-deployment.yaml"
+          - "uc2-kstreams-service.yaml"
+          - "uc2-jmx-configmap.yaml"
+          - "uc2-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc2-loadgen"
         files:
-          - "uc2-kstreams/uc2-load-generator-deployment.yaml"
-          - "uc2-kstreams/uc2-load-generator-service.yaml"
+          - "uc2-load-generator-deployment.yaml"
+          - "uc2-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
index cd6ee5b9c..bd58d7de0 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-flink"
           files:
-            - "uc3-flink/flink-configuration-configmap.yaml"
-            - "uc3-flink/taskmanager-deployment.yaml"
-            - "uc3-flink/taskmanager-service.yaml"
-            - "uc3-flink/service-monitor.yaml"
-            - "uc3-flink/jobmanager-service.yaml"
-            - "uc3-flink/jobmanager-deployment.yaml"
-            #- "uc3-flink/jobmanager-rest-service.yaml"
+            - "flink-configuration-configmap.yaml"
+            - "taskmanager-deployment.yaml"
+            - "taskmanager-service.yaml"
+            - "service-monitor.yaml"
+            - "jobmanager-service.yaml"
+            - "jobmanager-deployment.yaml"
+            #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc3-loadgen"
           files:
-            - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-            - "uc3-kstreams/uc3-load-generator-service.yaml"
+            - "uc3-load-generator-deployment.yaml"
+            - "uc3-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
index 003ce2fae..9151fb14e 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
       - configMap:
           name: "benchmark-resources-uc3-kstreams"
           files:
-          - "uc3-kstreams/uc3-kstreams-deployment.yaml"
-          - "uc3-kstreams/uc3-kstreams-service.yaml"
-          - "uc3-kstreams/uc3-jmx-configmap.yaml"
-          - "uc3-kstreams/uc3-service-monitor.yaml"
+          - "uc3-kstreams-deployment.yaml"
+          - "uc3-kstreams-service.yaml"
+          - "uc3-jmx-configmap.yaml"
+          - "uc3-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc3-loadgen"
           files:
-            - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-            - "uc3-kstreams/uc3-load-generator-service.yaml"
+            - "uc3-load-generator-deployment.yaml"
+            - "uc3-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
index 48f250192..8783a3d5e 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc3-kstreams"
         files:
-        - "uc3-kstreams/uc3-kstreams-deployment.yaml"
-        - "uc3-kstreams/uc3-kstreams-service.yaml"
-        - "uc3-kstreams/uc3-jmx-configmap.yaml"
-        - "uc3-kstreams/uc3-service-monitor.yaml"
+        - "uc3-kstreams-deployment.yaml"
+        - "uc3-kstreams-service.yaml"
+        - "uc3-jmx-configmap.yaml"
+        - "uc3-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc3-loadgen"
         files:
-          - "uc3-kstreams/uc3-load-generator-deployment.yaml"
-          - "uc3-kstreams/uc3-load-generator-service.yaml"
+          - "uc3-load-generator-deployment.yaml"
+          - "uc3-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
index 74d445bee..0ee6a3d9b 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -8,20 +8,20 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-flink"
           files:
-            - "uc4-flink/flink-configuration-configmap.yaml"
-            - "uc4-flink/taskmanager-deployment.yaml"
-            - "uc4-flink/taskmanager-service.yaml"
-            - "uc4-flink/service-monitor.yaml"
-            - "uc4-flink/jobmanager-service.yaml"
-            - "uc4-flink/jobmanager-deployment.yaml"
-            #- "uc4-flink/jobmanager-rest-service.yaml"
+            - "flink-configuration-configmap.yaml"
+            - "taskmanager-deployment.yaml"
+            - "taskmanager-service.yaml"
+            - "service-monitor.yaml"
+            - "jobmanager-service.yaml"
+            - "jobmanager-deployment.yaml"
+            #- "jobmanager-rest-service.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc4-loadgen"
           files:
-            - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-            - "uc4-kstreams/uc4-load-generator-service.yaml"
+            - "uc4-load-generator-deployment.yaml"
+            - "uc4-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
index 6f991eb5e..8cb563882 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
@@ -8,17 +8,17 @@ spec:
       - configMap:
           name: "benchmark-resources-uc4-kstreams"
           files:
-            - "uc4-kstreams/uc4-kstreams-deployment.yaml"
-            - "uc4-kstreams/uc4-kstreams-service.yaml"
-            - "uc4-kstreams/uc4-jmx-configmap.yaml"
-          - "uc4-kstreams/uc4-service-monitor.yaml"
+            - "uc4-kstreams-deployment.yaml"
+            - "uc4-kstreams-service.yaml"
+            - "uc4-jmx-configmap.yaml"
+            - "uc4-service-monitor.yaml"
   loadGenerator:
     resources:
       - configMap:
           name: "benchmark-resources-uc4-loadgen"
           files:
-            - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-            - "uc4-kstreams/uc4-load-generator-service.yaml"
+            - "uc4-load-generator-deployment.yaml"
+            - "uc4-load-generator-service.yaml"
   resourceTypes:
     - typeName: "Instances"
       patchers:
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
index b09cd420b..39e65f36d 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml
@@ -4,17 +4,17 @@ sut:
     - configMap:
         name: "benchmark-resources-uc4-kstreams"
         files:
-          - "uc4-kstreams/uc4-kstreams-deployment.yaml"
-          - "uc4-kstreams/uc4-kstreams-service.yaml"
-          - "uc4-kstreams/uc4-jmx-configmap.yaml"
-          - "uc4-kstreams/uc4-service-monitor.yaml"
+          - "uc4-kstreams-deployment.yaml"
+          - "uc4-kstreams-service.yaml"
+          - "uc4-jmx-configmap.yaml"
+          - "uc4-service-monitor.yaml"
 loadGenerator:
   resources:
     - configMap:
         name: "benchmark-resources-uc4-loadgen"
         files:
-          - "uc4-kstreams/uc4-load-generator-deployment.yaml"
-          - "uc4-kstreams/uc4-load-generator-service.yaml"
+          - "uc4-load-generator-deployment.yaml"
+          - "uc4-load-generator-service.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
-- 
GitLab