Skip to content

Commit 6042a4d

Browse files
authored
Fix flakiness in the tests (#2686)
1 parent 8b9f781 commit 6042a4d

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

.chainsaw.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ spec:
1010
cleanup: 5m0s
1111
delete: 5m0s
1212
error: 5m0s
13-
apply: 10s
13+
apply: 15s
14+
exec: 15s

tests/e2e-openshift/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -LO https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kube
2626
&& mv kubectl-kuttl_0.15.0_linux_x86_64 /usr/local/bin/kuttl
2727

2828
# Install Chainsaw e2e
29-
RUN go install github.com/kyverno/[email protected].6
29+
RUN go install github.com/kyverno/[email protected].7
3030

3131
# Install kubectl and oc
3232
RUN curl -LO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz \

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ spec:
3939
- name: step-05
4040
try:
4141
- script:
42-
content: ./check_traces.sh
42+
timeout: 2m
43+
content: ./check_traces.sh

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
creationTimestamp: null
66
name: monitoring
77
spec:
8+
# Avoid running this test case in parallel to prevent the deletion of shared resources used by multiple tests, specifically in the context of OpenShift user workload monitoring.
9+
concurrent: false
810
steps:
911
- name: step-00
1012
try:
@@ -32,4 +34,4 @@ spec:
3234
file: 03-assert.yaml
3335
- script:
3436
timeout: 5m
35-
content: ./check_metrics.sh
37+
content: ./check_metrics.sh

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

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
- name: step-02
2222
try:
2323
- script:
24+
timeout: 60s
2425
content: ./generate_certs.sh
2526
- apply:
2627
file: 02-otlp-receiver.yaml

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

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
creationTimestamp: null
66
name: otlp-metrics-traces
77
spec:
8+
# Avoid running this test case in parallel to prevent the deletion of shared resources used by multiple tests, specifically in the context of OpenShift user workload monitoring.
9+
concurrent: false
810
steps:
911
- name: step-00
1012
try:

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

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ spec:
1515
- name: step-01
1616
try:
1717
- script:
18+
timeout: 3m
1819
content: |
1920
#!/bin/bash
2021
set -ex

tests/e2e/ingress/chainsaw-test.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ kind: Test
44
metadata:
55
name: ingress
66
spec:
7-
skip: false
8-
concurrent: false
9-
skipDelete: false
10-
timeouts:
11-
apply: 10s
12-
assert: 10s
13-
error: 10s
147
steps:
158
- name: step-00
169
try:

0 commit comments

Comments
 (0)