From 9b79a2e4d58abbbc553a141636070c0e72047dde Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Tue, 13 Jul 2021 10:01:40 +0200
Subject: [PATCH] update benchmark and execution files
---
theodolite/.dockerignore | 3 ++-
theodolite/examples/operator/example-execution.yaml | 2 +-
theodolite/src/main/docker/Dockerfile.jvm | 1 +
theodolite/src/main/docker/Dockerfile.native | 1 +
.../main/kotlin/theodolite/execution/TheodoliteStandalone.kt | 4 ++--
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/theodolite/.dockerignore b/theodolite/.dockerignore
index d95caadc4..79aa51a50 100644
--- a/theodolite/.dockerignore
+++ b/theodolite/.dockerignore
@@ -3,4 +3,5 @@
!build/*-runner.jar
!build/lib/*
!build/quarkus-app/*
-!config/*
\ No newline at end of file
+!config/*
+!examples/*
\ No newline at end of file
diff --git a/theodolite/examples/operator/example-execution.yaml b/theodolite/examples/operator/example-execution.yaml
index 5386fd7c8..48452dee5 100644
--- a/theodolite/examples/operator/example-execution.yaml
+++ b/theodolite/examples/operator/example-execution.yaml
@@ -24,7 +24,7 @@ spec:
loadGenerationDelay: 30 # in seconds
restrictions:
- "LowerBound"
- configOverrides:
+ configOverrides: []
# - patcher:
# type: "NodeSelectorPatcher"
# resource: "uc1-load-generator-deployment.yaml"
diff --git a/theodolite/src/main/docker/Dockerfile.jvm b/theodolite/src/main/docker/Dockerfile.jvm
index 4800a0318..e0e5f42b7 100644
--- a/theodolite/src/main/docker/Dockerfile.jvm
+++ b/theodolite/src/main/docker/Dockerfile.jvm
@@ -45,6 +45,7 @@ ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jb
COPY build/lib/* /deployments/lib/
COPY build/*-runner.jar /deployments/app.jar
COPY config/ /deployments/config/
+COPY examples/ /deployments/examples/
EXPOSE 8080
USER 1001
diff --git a/theodolite/src/main/docker/Dockerfile.native b/theodolite/src/main/docker/Dockerfile.native
index d03e77564..5b49df3be 100644
--- a/theodolite/src/main/docker/Dockerfile.native
+++ b/theodolite/src/main/docker/Dockerfile.native
@@ -21,6 +21,7 @@ RUN chown 1001 /deployments \
&& chown 1001:root /deployments
COPY --chown=1001:root build/*-runner /deployments/application
COPY config/ /deployments/config/
+COPY examples/ /deployments/examples/
EXPOSE 8080
USER 1001
diff --git a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt
index 941868e9b..6b4a0bc88 100644
--- a/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt
+++ b/theodolite/src/main/kotlin/theodolite/execution/TheodoliteStandalone.kt
@@ -31,8 +31,8 @@ class TheodoliteStandalone {
fun start() {
logger.info { "Theodolite started" }
- val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "./config/example-execution-yaml-resource.yaml"
- val benchmarkPath = System.getenv("THEODOLITE_BENCHMARK") ?: "./config/example-benchmark-yaml-resource.yaml"
+ val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "./examples/standalone/example-execution.yaml"
+ val benchmarkPath = System.getenv("THEODOLITE_BENCHMARK") ?: "./examples/standalone/example-benchmark.yaml"
logger.info { "Using $executionPath for BenchmarkExecution" }
logger.info { "Using $benchmarkPath for BenchmarkType" }
--
GitLab