Skip to content

Commit

Permalink
Fix flakiness in the tests (#2686)
Browse files Browse the repository at this point in the history
  • Loading branch information
IshwarKanse authored Mar 5, 2024
1 parent ec675e7 commit 7f8fcb4
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .chainsaw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ spec:
cleanup: 5m0s
delete: 5m0s
error: 5m0s
apply: 10s
apply: 15s
exec: 15s
2 changes: 1 addition & 1 deletion tests/e2e-openshift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN curl -LO https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kube
&& mv kubectl-kuttl_0.15.0_linux_x86_64 /usr/local/bin/kuttl

# Install Chainsaw e2e
RUN go install github.com/kyverno/chainsaw@v0.1.6
RUN go install github.com/kyverno/chainsaw@v0.1.7

# Install kubectl and oc
RUN curl -LO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz \
Expand Down
3 changes: 2 additions & 1 deletion tests/e2e-openshift/kafka/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ spec:
- name: step-05
try:
- script:
content: ./check_traces.sh
timeout: 2m
content: ./check_traces.sh
4 changes: 3 additions & 1 deletion tests/e2e-openshift/monitoring/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
creationTimestamp: null
name: monitoring
spec:
# 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.
concurrent: false
steps:
- name: step-00
try:
Expand Down Expand Up @@ -32,4 +34,4 @@ spec:
file: 03-assert.yaml
- script:
timeout: 5m
content: ./check_metrics.sh
content: ./check_metrics.sh
1 change: 1 addition & 0 deletions tests/e2e-openshift/multi-cluster/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
- name: step-02
try:
- script:
timeout: 60s
content: ./generate_certs.sh
- apply:
file: 02-otlp-receiver.yaml
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e-openshift/otlp-metrics-traces/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
creationTimestamp: null
name: otlp-metrics-traces
spec:
# 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.
concurrent: false
steps:
- name: step-00
try:
Expand Down
1 change: 1 addition & 0 deletions tests/e2e-openshift/route/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
- name: step-01
try:
- script:
timeout: 3m
content: |
#!/bin/bash
set -ex
Expand Down
7 changes: 0 additions & 7 deletions tests/e2e/ingress/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ kind: Test
metadata:
name: ingress
spec:
skip: false
concurrent: false
skipDelete: false
timeouts:
apply: 10s
assert: 10s
error: 10s
steps:
- name: step-00
try:
Expand Down

0 comments on commit 7f8fcb4

Please sign in to comment.