From 068a2ea3e4e6fd4adcf6499939f007bfaccfaf92 Mon Sep 17 00:00:00 2001 From: lorenz <stu203404@mail.uni-kiel.de> Date: Sun, 28 Mar 2021 14:26:50 +0200 Subject: [PATCH] Fix pipeline --- .../main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt | 2 +- .../main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt index 79b113936..c6cce1f10 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/benchmark/KubernetesBenchmark.kt @@ -21,7 +21,7 @@ class KubernetesBenchmark : Benchmark { lateinit var loadTypes: List<TypeName> lateinit var kafkaConfig: KafkaConfig val namespace = System.getenv("NAMESPACE") ?: DEFAULT_NAMESPACE - val path = System.getenv("THEODOLITE_APP_RESOURCES") ?: "./config" + var path = System.getenv("THEODOLITE_APP_RESOURCES") ?: "./config" val client = DefaultKubernetesClient().inNamespace(namespace) private fun loadKubernetesResources(resources: List<String>): List<Pair<String, KubernetesResource>> { diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt index 8e856cac7..bb3a022ea 100644 --- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt +++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteYamlExecutor.kt @@ -17,11 +17,9 @@ object TheodoliteYamlExecutor { val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "./config/BenchmarkExecution.yaml" val benchmarkPath = System.getenv("THEODOLITE_BENCHMARK") ?: "./config/BenchmarkType.yaml" - val appResource = System.getenv("THEODOLITE_APP_RESOURCES") ?: "./config" logger.info { "Using $executionPath for BenchmarkExecution" } logger.info { "Using $benchmarkPath for BenchmarkType" } - logger.info { "Using $appResource for Resources" } // load the BenchmarkExecution and the BenchmarkType @@ -30,7 +28,6 @@ object TheodoliteYamlExecutor { parser.parse(path = executionPath, E = BenchmarkExecution::class.java)!! val benchmark = parser.parse(path = benchmarkPath, E = KubernetesBenchmark::class.java)!! - benchmark.path = appResource val shutdown = Shutdown(benchmarkExecution, benchmark) Runtime.getRuntime().addShutdownHook(shutdown) -- GitLab