Skip to content

Commit 008b3ac

Browse files
committed
Convert auth integration test to use deployments and not prerequisites
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent 289e49c commit 008b3ac

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed
Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,45 @@
11
---
22
cluster:
33
name: auth-integration-test
4-
prerequisites:
4+
deployments:
55
- name: prometheus
66
type: helm
77
repo: https://prometheus-community.github.io/helm-charts
88
chart: prometheus
99
namespace: prometheus
10-
valuesFile: charts/k8s-monitoring/tests/integration/auth/configs/prometheus.yaml
10+
valuesFile: configs/prometheus.yaml
1111
- name: passwords
1212
type: manifest
1313
namespace: prometheus
14-
file: charts/k8s-monitoring/tests/integration/auth/configs/passwords.yaml
14+
file: configs/passwords.yaml
1515
- name: nginx-basic-auth
1616
type: helm
1717
repo: https://charts.bitnami.com/bitnami
1818
chart: nginx
1919
version: 18.2.5
2020
namespace: prometheus
21-
valuesFile: charts/k8s-monitoring/tests/integration/auth/configs/nginx-basic-auth.yaml
21+
valuesFile: configs/nginx-basic-auth.yaml
2222
- name: nginx-bearer-token
2323
type: helm
2424
repo: https://charts.bitnami.com/bitnami
2525
chart: nginx
2626
version: 18.2.5
2727
namespace: prometheus
28-
valuesFile: charts/k8s-monitoring/tests/integration/auth/configs/nginx-bearer-token.yaml
28+
valuesFile: configs/nginx-bearer-token.yaml
2929

3030
- name: grafana
3131
type: helm
3232
repo: https://grafana.github.io/helm-charts
3333
chart: grafana
3434
namespace: grafana
35-
valuesFile: charts/k8s-monitoring/tests/integration/auth/configs/grafana.yaml
35+
valuesFile: configs/grafana.yaml
36+
37+
- name: k8smon
38+
type: helm
39+
chartPath: charts/k8s-monitoring
40+
valuesFile: values.yaml
41+
- name: k8s-monitoring-test
42+
type: helm
43+
chartPath: charts/k8s-monitoring-test
44+
valuesFile: test-values.yaml
45+
test: true

0 commit comments

Comments
 (0)