Skip to content
Snippets Groups Projects
Commit 068a2ea3 authored by Lorenz Boguhn's avatar Lorenz Boguhn
Browse files

Fix pipeline

parent 7edc2d4f
No related branches found
No related tags found
4 merge requests!159Re-implementation of Theodolite with Kotlin/Quarkus,!157Update Graal Image in CI pipeline,!109Introduce a Helm chart for the Theodolite operator,!83WIP: Re-implementation of Theodolite with Kotlin/Quarkus
...@@ -21,7 +21,7 @@ class KubernetesBenchmark : Benchmark { ...@@ -21,7 +21,7 @@ class KubernetesBenchmark : Benchmark {
lateinit var loadTypes: List<TypeName> lateinit var loadTypes: List<TypeName>
lateinit var kafkaConfig: KafkaConfig lateinit var kafkaConfig: KafkaConfig
val namespace = System.getenv("NAMESPACE") ?: DEFAULT_NAMESPACE 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) val client = DefaultKubernetesClient().inNamespace(namespace)
private fun loadKubernetesResources(resources: List<String>): List<Pair<String, KubernetesResource>> { private fun loadKubernetesResources(resources: List<String>): List<Pair<String, KubernetesResource>> {
......
...@@ -17,11 +17,9 @@ object TheodoliteYamlExecutor { ...@@ -17,11 +17,9 @@ object TheodoliteYamlExecutor {
val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "./config/BenchmarkExecution.yaml" val executionPath = System.getenv("THEODOLITE_EXECUTION") ?: "./config/BenchmarkExecution.yaml"
val benchmarkPath = System.getenv("THEODOLITE_BENCHMARK") ?: "./config/BenchmarkType.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 $executionPath for BenchmarkExecution" }
logger.info { "Using $benchmarkPath for BenchmarkType" } logger.info { "Using $benchmarkPath for BenchmarkType" }
logger.info { "Using $appResource for Resources" }
// load the BenchmarkExecution and the BenchmarkType // load the BenchmarkExecution and the BenchmarkType
...@@ -30,7 +28,6 @@ object TheodoliteYamlExecutor { ...@@ -30,7 +28,6 @@ object TheodoliteYamlExecutor {
parser.parse(path = executionPath, E = BenchmarkExecution::class.java)!! parser.parse(path = executionPath, E = BenchmarkExecution::class.java)!!
val benchmark = val benchmark =
parser.parse(path = benchmarkPath, E = KubernetesBenchmark::class.java)!! parser.parse(path = benchmarkPath, E = KubernetesBenchmark::class.java)!!
benchmark.path = appResource
val shutdown = Shutdown(benchmarkExecution, benchmark) val shutdown = Shutdown(benchmarkExecution, benchmark)
Runtime.getRuntime().addShutdownHook(shutdown) Runtime.getRuntime().addShutdownHook(shutdown)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment