Skip to content

Commit f720711

Browse files
authored
fix: chainsaw bad conversion (#2646)
* fix: chainsaw bad conversion Signed-off-by: Charles-Edouard Brétéché <[email protected]> * fix Signed-off-by: Charles-Edouard Brétéché <[email protected]> --------- Signed-off-by: Charles-Edouard Brétéché <[email protected]>
1 parent 4a0713d commit f720711

File tree

8 files changed

+42
-47
lines changed

8 files changed

+42
-47
lines changed

tests/e2e-opampbridge/opampbridge/chainsaw-test.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ metadata:
66
name: opampbridge
77
spec:
88
steps:
9-
- catch:
10-
- podLogs:
11-
selector: app.kubernetes.io/component=opentelemetry-opamp-bridge
12-
name: step-00
9+
- name: step-00
1310
try:
1411
- apply:
1512
file: 00-install.yaml
1613
- assert:
1714
file: 00-assert.yaml
15+
catch:
16+
- podLogs:
17+
selector: app.kubernetes.io/component=opentelemetry-opamp-bridge
18+

tests/e2e-openshift/kafka/chainsaw-test.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ spec:
3636
file: 04-generate-traces.yaml
3737
- assert:
3838
file: 04-assert.yaml
39-
- catch:
39+
- name: step-05
40+
try:
4041
- script:
4142
content: ./tests/e2e-openshift/kafka/check_traces.sh
42-
name: step-05
43-
try: null

tests/e2e-openshift/monitoring/chainsaw-test.yaml

+6-8
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ metadata:
66
name: monitoring
77
spec:
88
steps:
9-
- catch:
10-
- script:
11-
content: ./tests/e2e-openshift/monitoring/check_user_workload_monitoring.sh
12-
name: step-00
9+
- name: step-00
1310
try:
1411
- apply:
1512
file: 00-workload-monitoring.yaml
13+
- script:
14+
content: ./tests/e2e-openshift/monitoring/check_user_workload_monitoring.sh
1615
- name: step-01
1716
try:
1817
- apply:
@@ -25,12 +24,11 @@ spec:
2524
file: 02-generate-traces.yaml
2625
- assert:
2726
file: 02-assert.yaml
28-
- catch:
29-
- script:
30-
content: ./tests/e2e-openshift/monitoring/check_metrics.sh
31-
name: step-03
27+
- name: step-03
3228
try:
3329
- apply:
3430
file: 03-create-monitoring-roles.yaml
3531
- assert:
3632
file: 03-assert.yaml
33+
- script:
34+
content: ./tests/e2e-openshift/monitoring/check_metrics.sh

tests/e2e-openshift/multi-cluster/chainsaw-test.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ spec:
4040
file: 04-generate-traces.yaml
4141
- assert:
4242
file: 04-assert.yaml
43-
- catch:
43+
- name: step-05
44+
try:
4445
- script:
4546
content: ./tests/e2e-openshift/multi-cluster/check_traces.sh
46-
name: step-05
47-
try: null

tests/e2e-openshift/otlp-metrics-traces/chainsaw-test.yaml

+7-10
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ spec:
1212
file: 00-install-jaeger.yaml
1313
- assert:
1414
file: 00-assert.yaml
15-
- catch:
16-
- script:
17-
content: ./tests/e2e-openshift/otlp-metrics-traces/check_user_workload_monitoring.sh
18-
name: step-01
15+
- name: step-01
1916
try:
2017
- apply:
2118
file: 01-workload-monitoring.yaml
19+
- script:
20+
content: ./tests/e2e-openshift/otlp-metrics-traces/check_user_workload_monitoring.sh
2221
- name: step-02
2322
try:
2423
- apply:
@@ -31,13 +30,11 @@ spec:
3130
file: 03-metrics-traces-gen.yaml
3231
- assert:
3332
file: 03-assert.yaml
34-
- catch:
33+
- name: step-04
34+
try:
3535
- script:
3636
content: ./tests/e2e-openshift/otlp-metrics-traces/check_traces.sh
37-
name: step-04
38-
try: null
39-
- catch:
37+
- name: step-05
38+
try:
4039
- script:
4140
content: ./tests/e2e-openshift/otlp-metrics-traces/check_metrics.sh
42-
name: step-05
43-
try: null

tests/e2e-targetallocator/targetallocator-features/chainsaw-test.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ spec:
1111
openshift.io/sa.scc.uid-range: 1000/1000
1212
openshift.io/sa.scc.supplemental-groups: 3000/1000
1313
steps:
14-
- catch:
15-
- podLogs:
16-
selector: app.kubernetes.io/component=opentelemetry-targetallocator
17-
name: step-00
14+
- name: step-00
1815
try:
1916
- apply:
2017
template: true
2118
file: 00-install.yaml
2219
- assert:
2320
file: 00-assert.yaml
21+
catch:
22+
- podLogs:
23+
selector: app.kubernetes.io/component=opentelemetry-targetallocator
2424
- name: step-01
2525
try:
2626
- sleep:

tests/e2e/prometheus-config-validation/chainsaw-test.yaml

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ spec:
1717
try:
1818
- apply:
1919
file: 01-promreceiver-labeldrop.yaml
20-
- catch:
20+
- name: step-02
21+
try:
22+
- apply:
23+
file: 02-promreceiver-allocatorconfig-extra.yaml
24+
- assert:
25+
file: 02-assert.yaml
26+
catch:
2127
- podLogs:
2228
selector: app.kubernetes.io/component=opentelemetry-targetallocator
2329
- podLogs:
@@ -26,13 +32,13 @@ spec:
2632
container: manager
2733
namespace: opentelemetry-operator-system
2834
selector: app.kubernetes.io/name=opentelemetry-operator
29-
name: step-02
35+
- name: step-03
3036
try:
3137
- apply:
32-
file: 02-promreceiver-allocatorconfig-extra.yaml
38+
file: 03-promreceiver-nopromconfig.yaml
3339
- assert:
34-
file: 02-assert.yaml
35-
- catch:
40+
file: 03-assert.yaml
41+
catch:
3642
- podLogs:
3743
selector: app.kubernetes.io/component=opentelemetry-targetallocator
3844
- podLogs:
@@ -41,9 +47,4 @@ spec:
4147
container: manager
4248
namespace: opentelemetry-operator-system
4349
selector: app.kubernetes.io/name=opentelemetry-operator
44-
name: step-03
45-
try:
46-
- apply:
47-
file: 03-promreceiver-nopromconfig.yaml
48-
- assert:
49-
file: 03-assert.yaml
50+

tests/e2e/smoke-targetallocator/chainsaw-test.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ metadata:
66
name: smoke-targetallocator
77
spec:
88
steps:
9-
- catch:
10-
- podLogs:
11-
selector: app.kubernetes.io/component=opentelemetry-targetallocator
12-
name: step-00
9+
- name: step-00
1310
try:
1411
- apply:
1512
template: true
1613
file: 00-install.yaml
1714
- assert:
1815
file: 00-assert.yaml
16+
catch:
17+
- podLogs:
18+
selector: app.kubernetes.io/component=opentelemetry-targetallocator
1919
- name: step-01
2020
try:
2121
- apply:

0 commit comments

Comments
 (0)