Skip to content

Commit c9b7c28

Browse files
IshwarKanseIshwarKanse
authored
[Chore] Fix upgrade test to work for minor versions without operator, operand change. (#1298)
* Fix upgrade test to work for minor versions without operand, operator version change * fixes
1 parent 123fc63 commit c9b7c28

File tree

6 files changed

+49
-41
lines changed

6 files changed

+49
-41
lines changed

‎tests/e2e-openshift-upgrade/upgrade/assert-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ metadata:
4747
namespace: chainsaw-mmo-rbac
4848
status:
4949
operatorVersion: ($upgrade_operator_version)
50-
tempoVersion: ($upgrade_tempo_version)
50+
tempoVersion: ($upgrade_tempo_version)

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ spec:
139139
try:
140140
- apply:
141141
file: create-upgrade-catalog.yaml
142+
expect:
143+
- check:
144+
# Allow success or forbidden error
145+
($error == null || contains($error, 'forbidden')): true
142146
- assert:
143147
file: assert-upgrade-catalog.yaml
144148
- name: Upgrade Tempo Operator
@@ -159,6 +163,10 @@ spec:
159163
namespace: openshift-tempo-operator
160164
name: tempo-product
161165
format: yaml
166+
- name: Wait for the upgrade to complete specifically when upgrading to a minor version when the operator and operand version doesn't change.
167+
try:
168+
- sleep:
169+
duration: 120s
162170
- name: Assert TempoStack is ready
163171
try:
164172
- assert:
@@ -207,13 +215,13 @@ spec:
207215
format: yaml
208216
- name: Generate traces from namespace chainsaw-mono-rbac-1 for TempoMonolithic after upgrade
209217
try:
210-
- apply:
218+
- create:
211219
file: tempo-mono-rbac-sa-1-traces-gen.yaml
212220
- assert:
213221
file: assert-tempo-mono-rbac-sa-1-traces-gen.yaml
214222
- name: Generate traces from namespace chainsaw-mono-rbac-2 for TempoMonolithic after upgrade
215223
try:
216-
- apply:
224+
- create:
217225
file: tempo-mono-rbac-sa-2-traces-gen.yaml
218226
- assert:
219227
file: assert-tempo-mono-rbac-sa-2-traces-gen.yaml
@@ -223,18 +231,18 @@ spec:
223231
file: tempostack-rbac-sa-1-traces-verify.yaml
224232
- assert:
225233
file: assert-tempostack-rbac-sa-1-traces-verify.yaml
226-
- name: Verify kubeadmin can view traces from all projects for TempoStack after upgrade
227-
try:
228-
- create:
229-
file: kubeadmin-tempostack-traces-verify.yaml
230-
- assert:
231-
file: assert-kubeadmin-tempostack-traces-verify.yaml
232234
- name: Verify tracess using RBAC for TempoMonolithic after upgrade
233235
try:
234236
- create:
235237
file: tempo-mono-rbac-sa-1-traces-verify.yaml
236238
- assert:
237239
file: assert-tempo-mono-rbac-sa-1-traces-verify.yaml
240+
- name: Verify kubeadmin can view traces from all projects for TempoStack after upgrade
241+
try:
242+
- create:
243+
file: kubeadmin-tempostack-traces-verify.yaml
244+
- assert:
245+
file: assert-kubeadmin-tempostack-traces-verify.yaml
238246
- name: Verify kubeadmin can view traces from all projects for TempoMonolithic after upgrade
239247
try:
240248
- create:

‎tests/e2e-openshift-upgrade/upgrade/kubeadmin-tempo-mono-traces-verify.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ spec:
2828
--data-urlencode 'q={ resource.service.name="grpc-rbac-1" }' \
2929
| tee /tmp/jaeger-rbac-1.out
3030
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-1.out)
31-
if [[ "$num_traces" != "2" ]]; then
32-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for grpc-rbac-1."
31+
if [[ "$num_traces" -lt 2 ]]; then
32+
echo && echo "The Jaeger API returned $num_traces traces for grpc-rbac-1, expected at least 2."
3333
exit 1
3434
fi
3535
@@ -72,8 +72,8 @@ spec:
7272
--data-urlencode 'q={ resource.service.name="grpc-rbac-2" }' \
7373
| tee /tmp/jaeger-rbac-2.out
7474
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-2.out)
75-
if [[ "$num_traces" != "2" ]]; then
76-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for grpc-rbac-2."
75+
if [[ "$num_traces" -lt 2 ]]; then
76+
echo && echo "The Jaeger API returned $num_traces traces for grpc-rbac-2, expected at least 2."
7777
exit 1
7878
fi
7979
@@ -129,8 +129,8 @@ spec:
129129
--data-urlencode 'q={ resource.service.name="http-rbac-1" }' \
130130
| tee /tmp/jaeger-rbac-1.out
131131
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-1.out)
132-
if [[ "$num_traces" != "2" ]]; then
133-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for http-rbac-1."
132+
if [[ "$num_traces" -lt 2 ]]; then
133+
echo && echo "The Jaeger API returned $num_traces traces for http-rbac-1, expected at least 2."
134134
exit 1
135135
fi
136136
@@ -173,8 +173,8 @@ spec:
173173
--data-urlencode 'q={ resource.service.name="http-rbac-2" }' \
174174
| tee /tmp/jaeger-rbac-2.out
175175
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-2.out)
176-
if [[ "$num_traces" != "2" ]]; then
177-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for http-rbac-2."
176+
if [[ "$num_traces" -lt 2 ]]; then
177+
echo && echo "The Jaeger API returned $num_traces traces for http-rbac-2, expected at least 2."
178178
exit 1
179179
fi
180180

‎tests/e2e-openshift-upgrade/upgrade/kubeadmin-tempostack-traces-verify.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ spec:
2828
--data-urlencode 'q={ resource.service.name="grpc-rbac-1" }' \
2929
| tee /tmp/jaeger-rbac-1.out
3030
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-1.out)
31-
if [[ "$num_traces" != "2" ]]; then
32-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for grpc-rbac-1."
31+
if [[ "$num_traces" -lt 2 ]]; then
32+
echo && echo "The Jaeger API returned $num_traces traces for grpc-rbac-1, expected at least 2."
3333
exit 1
3434
fi
3535
@@ -72,8 +72,8 @@ spec:
7272
--data-urlencode 'q={ resource.service.name="grpc-rbac-2" }' \
7373
| tee /tmp/jaeger-rbac-2.out
7474
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-2.out)
75-
if [[ "$num_traces" != "2" ]]; then
76-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for grpc-rbac-2."
75+
if [[ "$num_traces" -lt 2 ]]; then
76+
echo && echo "The Jaeger API returned $num_traces traces for grpc-rbac-2, expected at least 2."
7777
exit 1
7878
fi
7979
@@ -129,8 +129,8 @@ spec:
129129
--data-urlencode 'q={ resource.service.name="http-rbac-1" }' \
130130
| tee /tmp/jaeger-rbac-1.out
131131
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-1.out)
132-
if [[ "$num_traces" != "2" ]]; then
133-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for http-rbac-1."
132+
if [[ "$num_traces" -lt 2 ]]; then
133+
echo && echo "The Jaeger API returned $num_traces traces for http-rbac-1, expected at least 2."
134134
exit 1
135135
fi
136136
@@ -173,8 +173,8 @@ spec:
173173
--data-urlencode 'q={ resource.service.name="http-rbac-2" }' \
174174
| tee /tmp/jaeger-rbac-2.out
175175
num_traces=$(jq ".traces | length" /tmp/jaeger-rbac-2.out)
176-
if [[ "$num_traces" != "2" ]]; then
177-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces for http-rbac-2."
176+
if [[ "$num_traces" -lt 2 ]]; then
177+
echo && echo "The Jaeger API returned $num_traces traces for http-rbac-2, expected at least 2."
178178
exit 1
179179
fi
180180

‎tests/e2e-openshift-upgrade/upgrade/tempo-mono-rbac-sa-1-traces-verify.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
--data-urlencode 'q={ resource.service.name="grpc-rbac-1" }' \
2626
| tee /tmp/jaeger.out
2727
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
28-
if [[ "$num_traces" != "2" ]]; then
29-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
28+
if [[ "$num_traces" -lt 2 ]]; then
29+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
3030
exit 1
3131
fi
3232
@@ -67,8 +67,8 @@ spec:
6767
--data-urlencode 'q={ resource.service.name="grpc-rbac-2" }' \
6868
| tee /tmp/jaeger.out
6969
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
70-
if [[ "$num_traces" != "2" ]]; then
71-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
70+
if [[ "$num_traces" -lt 2 ]]; then
71+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
7272
exit 1
7373
fi
7474
@@ -129,8 +129,8 @@ spec:
129129
--data-urlencode 'q={ resource.service.name="http-rbac-1" }' \
130130
| tee /tmp/jaeger.out
131131
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
132-
if [[ "$num_traces" != "2" ]]; then
133-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
132+
if [[ "$num_traces" -lt 2 ]]; then
133+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
134134
exit 1
135135
fi
136136
@@ -171,8 +171,8 @@ spec:
171171
--data-urlencode 'q={ resource.service.name="http-rbac-2" }' \
172172
| tee /tmp/jaeger.out
173173
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
174-
if [[ "$num_traces" != "2" ]]; then
175-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
174+
if [[ "$num_traces" -lt 2 ]]; then
175+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
176176
exit 1
177177
fi
178178

‎tests/e2e-openshift-upgrade/upgrade/tempostack-rbac-sa-1-traces-verify.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
--data-urlencode 'q={ resource.service.name="grpc-rbac-1" }' \
2626
| tee /tmp/jaeger.out
2727
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
28-
if [[ "$num_traces" != "2" ]]; then
29-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
28+
if [[ "$num_traces" -lt 2 ]]; then
29+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
3030
exit 1
3131
fi
3232
@@ -68,8 +68,8 @@ spec:
6868
--data-urlencode 'q={ resource.service.name="grpc-rbac-2" }' \
6969
| tee /tmp/jaeger.out
7070
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
71-
if [[ "$num_traces" != "2" ]]; then
72-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
71+
if [[ "$num_traces" -lt 2 ]]; then
72+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
7373
exit 1
7474
fi
7575
@@ -130,8 +130,8 @@ spec:
130130
--data-urlencode 'q={ resource.service.name="http-rbac-1" }' \
131131
| tee /tmp/jaeger.out
132132
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
133-
if [[ "$num_traces" != "2" ]]; then
134-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
133+
if [[ "$num_traces" -lt 2 ]]; then
134+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
135135
exit 1
136136
fi
137137
@@ -172,8 +172,8 @@ spec:
172172
--data-urlencode 'q={ resource.service.name="http-rbac-2" }' \
173173
| tee /tmp/jaeger.out
174174
num_traces=$(jq ".traces | length" /tmp/jaeger.out)
175-
if [[ "$num_traces" != "2" ]]; then
176-
echo && echo "The Jaeger API returned $num_traces instead of 2 traces."
175+
if [[ "$num_traces" -lt 2 ]]; then
176+
echo && echo "The Jaeger API returned $num_traces traces, expected at least 2."
177177
exit 1
178178
fi
179179

0 commit comments

Comments
 (0)