diff --git a/theodolite/.dockerignore b/theodolite/.dockerignore index d95caadc42523460fa9d78cf17629c8ee231acc9..79aa51a50c3b55c030860ca0272743b5a7a382d6 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 5386fd7c8665e01302067da81c5dd4caf87fc602..48452dee509aa57b36d4d76a8c4646996630a5c2 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 4800a03181194772f854a85a9b0ba0eed17365ec..e0e5f42b7003cbffd71bb0755d82efe3697cc04b 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 d03e77564f783b76d202986ebd7c1e336f013779..5b49df3be5c7c0df4f84b679e86ce58c773a73ce 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 941868e9b19b3059ee1260e05a1b3df0b27b04f5..6b4a0bc8855cb821f226a5fb4c0b41c95cafe956 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" }