Skip to content

Commit 5db6d7d

Browse files
stuggistuggi
committed
[kuttl] remove job CR conditions due to change with 4.18
With OCP 4.16 a successful finished job status condition only has a single Complete condition type in the condition list, e.g.: ~~~ status: completionTime: "2025-03-12T07:59:15Z" conditions: - lastProbeTime: "2025-03-12T07:59:15Z" lastTransitionTime: "2025-03-12T07:59:15Z" status: "True" type: Complete ready: 0 startTime: "2025-03-12T07:59:09Z" succeeded: 1 terminating: 0 uncountedTerminatedPods: {} ~~~ Starting with OCP 4.18 there is another condition, CompletionsReached`, e.g.: ~~~ status: completionTime: "2025-03-11T17:37:14Z" conditions: - lastProbeTime: "2025-03-11T17:37:14Z" lastTransitionTime: "2025-03-11T17:37:14Z" message: Reached expected number of succeeded pods reason: CompletionsReached status: "True" type: SuccessCriteriaMet - lastProbeTime: "2025-03-11T17:37:14Z" lastTransitionTime: "2025-03-11T17:37:14Z" message: Reached expected number of succeeded pods reason: CompletionsReached status: "True" type: Complete ready: 0 startTime: "2025-03-11T17:37:07Z" succeeded: 1 terminating: 0 uncountedTerminatedPods: {} ~~~ As a result switching to OCP 4.18 make the dataplane kuttl tests to fail because kuttl can not validate a single entry from a list. ~~~ status: + completionTime: "2025-03-11T19:02:07Z" conditions: - - status: "True" + - lastProbeTime: "2025-03-11T19:02:07Z" + lastTransitionTime: "2025-03-11T19:02:07Z" + message: Reached expected number of succeeded pods + reason: CompletionsReached + status: "True" + type: SuccessCriteriaMet + - lastProbeTime: "2025-03-11T19:02:07Z" + lastTransitionTime: "2025-03-11T19:02:07Z" + message: Reached expected number of succeeded pods + reason: CompletionsReached + status: "True" type: Complete ready: 0 + startTime: "2025-03-11T19:02:02Z" succeeded: 1 terminating: 0 uncountedTerminatedPods: {} case.go:380: resource Job:openstack-kuttl-tests/configure-os-edpm-compute-global-edpm-compute-global: .status.conditions: slice length mismatch: 1 != 2 ~~~ This PR removes the conditions on the job asserts since the succeeded:1 should be enough to validate that the job ran successful. Signed-off-by: Martin Schuppert <[email protected]>
1 parent fc6a16d commit 5db6d7d

File tree

9 files changed

+0
-73
lines changed

9 files changed

+0
-73
lines changed

‎tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ spec:
169169
path: inventory-0
170170
secretName: dataplanenodeset-edpm-compute-global
171171
status:
172-
conditions:
173-
- status: "True"
174-
type: Complete
175172
succeeded: 1
176173
uncountedTerminatedPods: {}
177174
---
@@ -268,9 +265,6 @@ spec:
268265
path: inventory
269266
secretName: dataplanenodeset-edpm-compute-global
270267
status:
271-
conditions:
272-
- status: "True"
273-
type: Complete
274268
ready: 0
275269
succeeded: 1
276270
terminating: 0
@@ -369,14 +363,10 @@ spec:
369363
path: inventory
370364
secretName: dataplanenodeset-edpm-compute-global
371365
status:
372-
conditions:
373-
- status: "True"
374-
type: Complete
375366
ready: 0
376367
succeeded: 1
377368
terminating: 0
378369
uncountedTerminatedPods: {}
379-
380370
---
381371
apiVersion: batch/v1
382372
kind: Job
@@ -471,14 +461,10 @@ spec:
471461
path: inventory
472462
secretName: dataplanenodeset-edpm-compute-global
473463
status:
474-
conditions:
475-
- status: "True"
476-
type: Complete
477464
ready: 0
478465
succeeded: 1
479466
terminating: 0
480467
uncountedTerminatedPods: {}
481-
482468
---
483469
apiVersion: batch/v1
484470
kind: Job
@@ -573,14 +559,10 @@ spec:
573559
path: inventory
574560
secretName: dataplanenodeset-edpm-compute-global
575561
status:
576-
conditions:
577-
- status: "True"
578-
type: Complete
579562
ready: 0
580563
succeeded: 1
581564
terminating: 0
582565
uncountedTerminatedPods: {}
583-
584566
---
585567
apiVersion: batch/v1
586568
kind: Job
@@ -675,14 +657,10 @@ spec:
675657
path: inventory
676658
secretName: dataplanenodeset-edpm-compute-global
677659
status:
678-
conditions:
679-
- status: "True"
680-
type: Complete
681660
ready: 0
682661
succeeded: 1
683662
terminating: 0
684663
uncountedTerminatedPods: {}
685-
686664
---
687665
apiVersion: batch/v1
688666
kind: Job

‎tests/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ spec:
164164
path: inventory
165165
secretName: dataplanenodeset-edpm-compute-beta-nodeset
166166
status:
167-
conditions:
168-
- status: "True"
169-
type: Complete
170167
ready: 0
171168
succeeded: 1
172169
terminating: 0
@@ -264,9 +261,6 @@ spec:
264261
path: inventory
265262
secretName: dataplanenodeset-edpm-compute-beta-nodeset
266263
status:
267-
conditions:
268-
- status: "True"
269-
type: Complete
270264
ready: 0
271265
succeeded: 1
272266
terminating: 0

‎tests/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ spec:
225225
path: inventory
226226
secretName: dataplanenodeset-openstack-edpm-tls
227227
status:
228-
conditions:
229-
- status: "True"
230-
type: Complete
231228
succeeded: 1
232229
uncountedTerminatedPods: {}
233230
---
@@ -329,8 +326,5 @@ spec:
329326
path: inventory
330327
secretName: dataplanenodeset-openstack-edpm-tls
331328
status:
332-
conditions:
333-
- status: "True"
334-
type: Complete
335329
succeeded: 1
336330
uncountedTerminatedPods: {}

‎tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@ spec:
160160
path: inventory
161161
secretName: dataplanenodeset-edpm-compute-no-nodes
162162
status:
163-
conditions:
164-
- status: "True"
165-
type: Complete
166163
ready: 0
167164
succeeded: 1
168165
terminating: 0
@@ -262,9 +259,6 @@ spec:
262259
path: inventory
263260
secretName: dataplanenodeset-edpm-compute-no-nodes
264261
status:
265-
conditions:
266-
- status: "True"
267-
type: Complete
268262
ready: 0
269263
succeeded: 1
270264
terminating: 0
@@ -365,9 +359,6 @@ spec:
365359
path: inventory
366360
secretName: dataplanenodeset-edpm-compute-no-nodes
367361
status:
368-
conditions:
369-
- status: "True"
370-
type: Complete
371362
ready: 0
372363
succeeded: 1
373364
terminating: 0
@@ -468,9 +459,6 @@ spec:
468459
path: inventory
469460
secretName: dataplanenodeset-edpm-compute-no-nodes
470461
status:
471-
conditions:
472-
- status: "True"
473-
type: Complete
474462
ready: 0
475463
succeeded: 1
476464
terminating: 0
@@ -571,9 +559,6 @@ spec:
571559
path: inventory
572560
secretName: dataplanenodeset-edpm-compute-no-nodes
573561
status:
574-
conditions:
575-
- status: "True"
576-
type: Complete
577562
ready: 0
578563
succeeded: 1
579564
terminating: 0

‎tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ spec:
103103
path: inventory
104104
secretName: dataplanenodeset-edpm-compute-no-nodes
105105
status:
106-
conditions:
107-
- status: "True"
108-
type: Complete
109106
ready: 0
110107
succeeded: 1
111108
terminating: 0

‎tests/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,6 @@ spec:
172172
path: inventory
173173
secretName: dataplanenodeset-edpm-compute-no-nodes
174174
status:
175-
conditions:
176-
- status: "True"
177-
type: Complete
178175
ready: 0
179176
succeeded: 1
180177
terminating: 0

‎tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ spec:
163163
path: inventory
164164
secretName: dataplanenodeset-edpm-compute-beta-nodeset
165165
status:
166-
conditions:
167-
- status: "True"
168-
type: Complete
169166
ready: 0
170167
succeeded: 1
171168
terminating: 0
@@ -266,9 +263,6 @@ spec:
266263
path: inventory
267264
secretName: dataplanenodeset-edpm-compute-beta-nodeset
268265
status:
269-
conditions:
270-
- status: "True"
271-
type: Complete
272266
ready: 0
273267
succeeded: 1
274268
terminating: 0

‎tests/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,6 @@ spec:
262262
path: inventory
263263
secretName: dataplanenodeset-openstack-edpm-tls
264264
status:
265-
conditions:
266-
- status: "True"
267-
type: Complete
268265
ready: 0
269266
succeeded: 1
270267
terminating: 0
@@ -371,9 +368,6 @@ spec:
371368
path: inventory
372369
secretName: dataplanenodeset-openstack-edpm-tls
373370
status:
374-
conditions:
375-
- status: "True"
376-
type: Complete
377371
ready: 0
378372
succeeded: 1
379373
terminating: 0

‎tests/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ spec:
241241
path: inventory
242242
secretName: dataplanenodeset-openstack-edpm-tls
243243
status:
244-
conditions:
245-
- status: "True"
246-
type: Complete
247244
ready: 0
248245
succeeded: 1
249246
terminating: 0
@@ -349,9 +346,6 @@ spec:
349346
path: inventory
350347
secretName: dataplanenodeset-openstack-edpm-tls
351348
status:
352-
conditions:
353-
- status: "True"
354-
type: Complete
355349
ready: 0
356350
succeeded: 1
357351
terminating: 0

0 commit comments

Comments
 (0)