Skip to content

Commit eef86b3

Browse files
IshwarKanseIshwarKanse
committed
Fix tests migrated to Chainsaw
1 parent f720711 commit eef86b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+323
-228
lines changed

‎.chainsaw.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ metadata:
66
spec:
77
parallel: 4
88
timeouts:
9-
assert: 5m0s
9+
assert: 6m0s
1010
cleanup: 5m0s
1111
delete: 5m0s
1212
error: 5m0s
13+
apply: 10s

‎otel-chainsaw-report.xml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<TestsReport name="otel-chainsaw-report" timestamp="2024-02-19T18:55:30.461661+05:30" time="63.096" tests="19" failures="1">
2+
<testsuite name="create-pm-prometheus-exporters" timestamp="2024-02-19T18:55:30.462066+05:30" time="63.096" tests="3">
3+
<testcase name="step-00">
4+
<results name="Apply 00-install.yaml" timestamp="2024-02-19T18:55:31.877346+05:30" time="" result="" operationType="apply"></results>
5+
</testcase>
6+
<testcase name="step-01">
7+
<results name="Apply 01-install-app.yaml" timestamp="2024-02-19T18:55:33.599454+05:30" time="" result="" operationType="apply"></results>
8+
<results name="Assert " timestamp="2024-02-19T18:55:33.600027+05:30" time="3.600" result="Success" operationType="assert">
9+
<message>Operation completed successfully</message>
10+
</results>
11+
</testcase>
12+
</testsuite>
13+
<testsuite name="create-sm-prometheus-exporters" timestamp="2024-02-19T18:55:30.462081+05:30" time="38.149" tests="16">
14+
<failure message="test failed"></failure>
15+
<testcase name="step-00">
16+
<results name="Apply 00-install.yaml" timestamp="2024-02-19T18:55:31.877018+05:30" time="" result="" operationType="apply"></results>
17+
</testcase>
18+
<testcase name="step-01">
19+
<results name="Apply 01-install.yaml" timestamp="2024-02-19T18:55:32.528409+05:30" time="" result="" operationType="apply"></results>
20+
<results name="Assert " timestamp="2024-02-19T18:55:32.529243+05:30" time="2.552" result="Success" operationType="assert">
21+
<message>Operation completed successfully</message>
22+
</results>
23+
</testcase>
24+
<testcase name="step-02">
25+
<results name="Apply 02-install.yaml" timestamp="2024-02-19T18:55:35.081731+05:30" time="" result="" operationType="apply"></results>
26+
<results name="Assert " timestamp="2024-02-19T18:55:35.082569+05:30" time="1.570" result="Success" operationType="assert">
27+
<message>Operation completed successfully</message>
28+
</results>
29+
</testcase>
30+
<testcase name="step-03">
31+
<results name="Apply 03-install.yaml" timestamp="2024-02-19T18:55:36.653699+05:30" time="" result="" operationType="apply"></results>
32+
<results name="Assert " timestamp="2024-02-19T18:55:36.654313+05:30" time="1.971" result="Success" operationType="assert">
33+
<message>Operation completed successfully</message>
34+
</results>
35+
</testcase>
36+
<testcase name="step-04">
37+
<results name="Apply 04-error.yaml" timestamp="2024-02-19T18:55:38.62667+05:30" time="" result="" operationType="apply"></results>
38+
<results name="Apply 04-install.yaml" timestamp="2024-02-19T18:55:38.627036+05:30" time="" result="" operationType="apply"></results>
39+
</testcase>
40+
<testcase name="step-05">
41+
<results name="Apply 05-error.yaml" timestamp="2024-02-19T18:55:40.191101+05:30" time="" result="" operationType="apply"></results>
42+
<results name="Apply 05-install.yaml" timestamp="2024-02-19T18:55:40.191731+05:30" time="" result="" operationType="apply"></results>
43+
<results name="Assert " timestamp="2024-02-19T18:55:40.192343+05:30" time="1.471" result="Success" operationType="assert">
44+
<message>Operation completed successfully</message>
45+
</results>
46+
</testcase>
47+
<testcase name="step-06">
48+
<results name="Apply 06-install.yaml" timestamp="2024-02-19T18:55:41.664258+05:30" time="" result="" operationType="apply"></results>
49+
<results name="Assert " timestamp="2024-02-19T18:55:41.664684+05:30" time="1.071" result="Success" operationType="assert">
50+
<message>Operation completed successfully</message>
51+
</results>
52+
</testcase>
53+
<testcase name="step-07">
54+
<results name="Delete " timestamp="2024-02-19T18:55:42.735351+05:30" time="0.728" result="Success" operationType="delete">
55+
<message>Operation completed successfully</message>
56+
</results>
57+
<results name="Apply 07-error.yaml" timestamp="2024-02-19T18:55:42.736205+05:30" time="" result="" operationType="apply"></results>
58+
</testcase>
59+
</testsuite>
60+
</TestsReport>

‎tests/e2e-autoscale/autoscale/02-install.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
- --otlp-insecure
1616
# High duration to ensure the trace creation doesn't stop.
1717
# It'll be stopped in step 4
18-
- --duration=1m
18+
- --duration=6m
1919
- --workers=20
2020
- traces
2121
restartPolicy: Never

‎tests/e2e-openshift/Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The Dockerfile's resulting image is purpose-built for executing OpenTelemetry Operator e2e tests within the OpenShift release (https://github.com/openshift/release) using Prow CI.
22

3-
FROM golang:1.20
3+
FROM golang:1.21
44

55
# Copy the repository files
66
COPY . /tmp/opentelemetry-operator
@@ -25,6 +25,9 @@ RUN curl -LO https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kube
2525
&& chmod +x kubectl-kuttl_0.15.0_linux_x86_64 \
2626
&& mv kubectl-kuttl_0.15.0_linux_x86_64 /usr/local/bin/kuttl
2727

28+
# Install Chainsaw e2e testing tool
29+
RUN go install github.com/kyverno/chainsaw@latest
30+
2831
# Install kubectl and oc
2932
RUN curl -LO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz \
3033
&& tar -xzf openshift-client-linux.tar.gz \

‎tests/e2e-openshift/kafka/00-assert.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Namespace
33
metadata:
4-
name: kuttl-kafka
4+
name: chainsaw-kafka
55

66
---
77
apiVersion: apps/v1
@@ -17,7 +17,7 @@ metadata:
1717
strimzi.io/kind: Kafka
1818
strimzi.io/name: my-cluster-entity-operator
1919
name: my-cluster-entity-operator
20-
namespace: kuttl-kafka
20+
namespace: chainsaw-kafka
2121
status:
2222
availableReplicas: 1
2323
readyReplicas: 1
@@ -28,7 +28,7 @@ apiVersion: v1
2828
kind: Pod
2929
metadata:
3030
name: my-cluster-kafka-0
31-
namespace: kuttl-kafka
31+
namespace: chainsaw-kafka
3232
status:
3333
phase: Running
3434

@@ -37,7 +37,7 @@ apiVersion: v1
3737
kind: Pod
3838
metadata:
3939
name: my-cluster-zookeeper-0
40-
namespace: kuttl-kafka
40+
namespace: chainsaw-kafka
4141
status:
4242
phase: Running
4343

@@ -56,7 +56,7 @@ metadata:
5656
strimzi.io/kind: Kafka
5757
strimzi.io/name: my-cluster-kafka
5858
name: my-cluster-kafka-bootstrap
59-
namespace: kuttl-kafka
59+
namespace: chainsaw-kafka
6060
spec:
6161
ports:
6262
- name: tcp-replication
@@ -90,7 +90,7 @@ metadata:
9090
strimzi.io/kind: Kafka
9191
strimzi.io/name: my-cluster-kafka
9292
name: my-cluster-kafka-brokers
93-
namespace: kuttl-kafka
93+
namespace: chainsaw-kafka
9494
spec:
9595
ports:
9696
- name: tcp-ctrlplane
@@ -133,7 +133,7 @@ metadata:
133133
strimzi.io/kind: Kafka
134134
strimzi.io/name: my-cluster-zookeeper
135135
name: my-cluster-zookeeper-client
136-
namespace: kuttl-kafka
136+
namespace: chainsaw-kafka
137137
spec:
138138
ports:
139139
- name: tcp-clients
@@ -159,7 +159,7 @@ metadata:
159159
strimzi.io/kind: Kafka
160160
strimzi.io/name: my-cluster-zookeeper
161161
name: my-cluster-zookeeper-nodes
162-
namespace: kuttl-kafka
162+
namespace: chainsaw-kafka
163163
spec:
164164
ports:
165165
- name: tcp-clients

‎tests/e2e-openshift/kafka/00-create-kafka-instance.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
apiVersion: v1
44
kind: Namespace
55
metadata:
6-
name: kuttl-kafka
6+
name: chainsaw-kafka
77

88
---
99
apiVersion: kafka.strimzi.io/v1beta2
1010
kind: Kafka
1111
metadata:
1212
name: my-cluster
13-
namespace: kuttl-kafka
13+
namespace: chainsaw-kafka
1414
spec:
1515
entityOperator:
1616
topicOperator:

‎tests/e2e-openshift/kafka/01-assert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta2
22
kind: KafkaTopic
33
metadata:
44
name: otlp-spans
5-
namespace: kuttl-kafka
5+
namespace: chainsaw-kafka
66
spec:
77
config:
88
retention.ms: 300000

‎tests/e2e-openshift/kafka/01-create-kafka-topics.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
labels:
55
strimzi.io/cluster: my-cluster
66
name: otlp-spans
7-
namespace: kuttl-kafka
7+
namespace: chainsaw-kafka
88
spec:
99
config:
1010
retention.ms: 300000

‎tests/e2e-openshift/kafka/02-assert.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ kind: Deployment
33
metadata:
44
labels:
55
app.kubernetes.io/component: opentelemetry-collector
6-
app.kubernetes.io/instance: kuttl-kafka.kafka-receiver
6+
app.kubernetes.io/instance: chainsaw-kafka.kafka-receiver
77
app.kubernetes.io/managed-by: opentelemetry-operator
88
app.kubernetes.io/name: kafka-receiver-collector
99
app.kubernetes.io/part-of: opentelemetry
1010
app.kubernetes.io/version: latest
1111
name: kafka-receiver-collector
12-
namespace: kuttl-kafka
12+
namespace: chainsaw-kafka
1313
status:
1414
availableReplicas: 1
1515
readyReplicas: 1
@@ -21,11 +21,11 @@ kind: Service
2121
metadata:
2222
labels:
2323
app.kubernetes.io/component: opentelemetry-collector
24-
app.kubernetes.io/instance: kuttl-kafka.kafka-receiver
24+
app.kubernetes.io/instance: chainsaw-kafka.kafka-receiver
2525
app.kubernetes.io/managed-by: opentelemetry-operator
2626
app.kubernetes.io/name: kafka-receiver-collector-monitoring
2727
name: kafka-receiver-collector-monitoring
28-
namespace: kuttl-kafka
28+
namespace: chainsaw-kafka
2929
spec:
3030
ports:
3131
- name: monitoring
@@ -34,6 +34,6 @@ spec:
3434
targetPort: 8888
3535
selector:
3636
app.kubernetes.io/component: opentelemetry-collector
37-
app.kubernetes.io/instance: kuttl-kafka.kafka-receiver
37+
app.kubernetes.io/instance: chainsaw-kafka.kafka-receiver
3838
app.kubernetes.io/managed-by: opentelemetry-operator
3939
type: ClusterIP

‎tests/e2e-openshift/kafka/02-otel-kakfa-receiver.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apiVersion: opentelemetry.io/v1alpha1
22
kind: OpenTelemetryCollector
33
metadata:
44
name: kafka-receiver
5-
namespace: kuttl-kafka
5+
namespace: chainsaw-kafka
66
spec:
77
mode: "deployment"
88
config: |
99
receivers:
1010
kafka/traces:
11-
brokers: ["my-cluster-kafka-brokers.kuttl-kafka.svc:9092"]
11+
brokers: ["my-cluster-kafka-brokers.chainsaw-kafka.svc:9092"]
1212
protocol_version: 3.5.0
1313
topic: otlp-spans
1414
exporters:

‎tests/e2e-openshift/kafka/03-assert.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ kind: Deployment
33
metadata:
44
labels:
55
app.kubernetes.io/component: opentelemetry-collector
6-
app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
6+
app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
77
app.kubernetes.io/managed-by: opentelemetry-operator
88
app.kubernetes.io/name: kafka-exporter-collector
99
app.kubernetes.io/part-of: opentelemetry
1010
app.kubernetes.io/version: latest
1111
name: kafka-exporter-collector
12-
namespace: kuttl-kafka
12+
namespace: chainsaw-kafka
1313
status:
1414
availableReplicas: 1
1515
readyReplicas: 1
@@ -21,11 +21,11 @@ kind: Service
2121
metadata:
2222
labels:
2323
app.kubernetes.io/component: opentelemetry-collector
24-
app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
24+
app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
2525
app.kubernetes.io/managed-by: opentelemetry-operator
2626
app.kubernetes.io/name: kafka-exporter-collector
2727
name: kafka-exporter-collector
28-
namespace: kuttl-kafka
28+
namespace: chainsaw-kafka
2929
spec:
3030
ports:
3131
- appProtocol: grpc
@@ -40,7 +40,7 @@ spec:
4040
targetPort: 4318
4141
selector:
4242
app.kubernetes.io/component: opentelemetry-collector
43-
app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
43+
app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
4444
app.kubernetes.io/managed-by: opentelemetry-operator
4545
sessionAffinity: None
4646

@@ -50,12 +50,12 @@ kind: Service
5050
metadata:
5151
labels:
5252
app.kubernetes.io/component: opentelemetry-collector
53-
app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
53+
app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
5454
app.kubernetes.io/managed-by: opentelemetry-operator
5555
app.kubernetes.io/name: kafka-exporter-collector
5656
operator.opentelemetry.io/collector-headless-service: Exists
5757
name: kafka-exporter-collector-headless
58-
namespace: kuttl-kafka
58+
namespace: chainsaw-kafka
5959
spec:
6060
ports:
6161
- appProtocol: grpc
@@ -70,6 +70,6 @@ spec:
7070
targetPort: 4318
7171
selector:
7272
app.kubernetes.io/component: opentelemetry-collector
73-
app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
73+
app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
7474
app.kubernetes.io/managed-by: opentelemetry-operator
7575
type: ClusterIP

‎tests/e2e-openshift/kafka/03-otel-kakfa-exporter.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: opentelemetry.io/v1alpha1
22
kind: OpenTelemetryCollector
33
metadata:
44
name: kafka-exporter
5-
namespace: kuttl-kafka
5+
namespace: chainsaw-kafka
66
spec:
77
mode: deployment
88
config: |
@@ -14,7 +14,7 @@ spec:
1414
processors:
1515
exporters:
1616
kafka/traces:
17-
brokers: ["my-cluster-kafka-brokers.kuttl-kafka.svc:9092"]
17+
brokers: ["my-cluster-kafka-brokers.chainsaw-kafka.svc:9092"]
1818
protocol_version: 3.5.0
1919
topic: otlp-spans
2020
service:

‎tests/e2e-openshift/kafka/04-generate-traces.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spec:
1515
image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.92.0
1616
command: ["./telemetrygen"]
1717
args:
18-
- "--otlp-endpoint=kafka-exporter-collector-headless.kuttl-kafka.svc:4317"
18+
- "--otlp-endpoint=kafka-exporter-collector-headless.chainsaw-kafka.svc:4317"
1919
- "--otlp-insecure=true"
2020
- "--rate=1"
2121
- "--duration=30s"
22-
- "--otlp-attributes=test=\"kuttl-kafka\""
22+
- "--otlp-attributes=test=\"chainsaw-kafka\""
2323
- "--otlp-header=kafka-topic=\"otlp-spans\""
2424
- "--service=\"kafka\""
2525
- "traces"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ spec:
3939
- name: step-05
4040
try:
4141
- script:
42-
content: ./tests/e2e-openshift/kafka/check_traces.sh
42+
content: ./check_traces.sh

0 commit comments

Comments
 (0)