Skip to content
Snippets Groups Projects
Commit 7d1bfd44 authored by Sören Henning's avatar Sören Henning
Browse files

Merge branch 'theodolite-kotlin' into start-using-defaults-issue-191

parents ad24275f 516f2200
No related branches found
No related tags found
4 merge requests!159Re-implementation of Theodolite with Kotlin/Quarkus,!157Update Graal Image in CI pipeline,!115Start using new Theodolite defaults,!83WIP: Re-implementation of Theodolite with Kotlin/Quarkus
Pipeline #2734 passed
...@@ -51,7 +51,7 @@ build-benchmarks: ...@@ -51,7 +51,7 @@ build-benchmarks:
- "theodolite-benchmarks/build/libs/*.jar" - "theodolite-benchmarks/build/libs/*.jar"
- "theodolite-benchmarks/*/build/libs/*.jar" - "theodolite-benchmarks/*/build/libs/*.jar"
- "theodolite-benchmarks/*/build/distributions/*.tar" - "theodolite-benchmarks/*/build/distributions/*.tar"
expire_in: 1 day expire_in: 6 hours
test-benchmarks: test-benchmarks:
stage: test stage: test
...@@ -234,7 +234,7 @@ build-theodolite-jvm: ...@@ -234,7 +234,7 @@ build-theodolite-jvm:
paths: paths:
- "theodolite-quarkus/build/lib/*" - "theodolite-quarkus/build/lib/*"
- "theodolite-quarkus/build/*-runner.jar" - "theodolite-quarkus/build/*-runner.jar"
expire_in: 1 day expire_in: 6 hours
build-theodolite-native: build-theodolite-native:
stage: build stage: build
...@@ -245,7 +245,7 @@ build-theodolite-native: ...@@ -245,7 +245,7 @@ build-theodolite-native:
artifacts: artifacts:
paths: paths:
- "theodolite-quarkus/build/*-runner" - "theodolite-quarkus/build/*-runner"
expire_in: 1 day expire_in: 6 hours
test-theodolite: test-theodolite:
stage: test stage: test
......
...@@ -24,6 +24,9 @@ grafana: ...@@ -24,6 +24,9 @@ grafana:
# Administrator credentials when not using an existing secret (see below) # Administrator credentials when not using an existing secret (see below)
adminUser: admin adminUser: admin
adminPassword: admin adminPassword: admin
grafana.ini:
users:
default_theme: light
## Sidecars that collect the configmaps with specified label and stores the included files them into the respective folders ## Sidecars that collect the configmaps with specified label and stores the included files them into the respective folders
## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards ## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards
sidecar: sidecar:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment