Skip to content

Commit ae2a438

Browse files
authored
fix directory references for charts dir that was moved (#1177)
Signed-off-by: Eric Sauer <esauer@redhat.com>
1 parent 76d31f0 commit ae2a438

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

.github/workflows/conftest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ on:
55
branches: [ main ]
66
paths:
77
- '_test/**'
8-
- 'charts/**'
8+
- 'pelorus-operator/helm-charts/**'
99
- '.github/workflows/conftest.yml'
1010
- 'Makefile'
1111

1212
pull_request:
1313
branches: [ main ]
1414
paths:
1515
- '_test/**'
16-
- 'charts/**'
16+
- 'pelorus-operator/helm-charts/**'
1717
- '.github/workflows/conftest.yml'
1818
- 'Makefile'
1919

_test/conftest.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,8 @@ setup_file() {
99
conftest_pull
1010
}
1111

12-
@test "charts/operators" {
13-
tmp=$(helm_template "charts/operators")
14-
15-
namespaces=$(get_rego_namespaces "ocp\.deprecated\.*")
16-
cmd="conftest test ${tmp} --output tap ${namespaces}"
17-
run ${cmd}
18-
19-
print_info "${status}" "${output}" "${cmd}" "${tmp}"
20-
[ "$status" -eq 0 ]
21-
}
22-
2312
@test "charts/pelorus" {
24-
tmp=$(helm_template "charts/pelorus")
13+
tmp=$(helm_template "pelorus-operator/helm-charts/pelorus")
2514

2615
namespaces=$(get_rego_namespaces "ocp\.deprecated\.*")
2716
cmd="conftest test ${tmp} --output tap ${namespaces}"

_test/test_prometheusrules.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
RULES_FILE="charts/pelorus/templates/prometheus-rules.yaml"
2+
RULES_FILE="pelorus-operator/helm-charts/pelorus/templates/prometheus-rules.yaml"
33
TESTS_DIR="_test/prometheus"
44

55
# Capture prometheus rules file out to a new temporary file

0 commit comments

Comments
 (0)