Skip to content

Commit f9e2832

Browse files
philrhurstphilrhurst
committed
Update chainsaw tests with helpful sleeps
1 parent 408d93c commit f9e2832

File tree

4 files changed

+152
-14
lines changed

4 files changed

+152
-14
lines changed

‎testing/chainsaw/e2e/backup/chainsaw-test.yaml‎

Lines changed: 91 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,32 @@ spec:
1919

2020
steps:
2121

22-
- name: 'Create Cluster with PGO CLI'
22+
- name: 'Create Cluster from manifest'
2323
use:
2424
template: '../templates/create-cluster-from-manifest.yaml'
2525

26+
- name: Sleep for 10s
27+
try:
28+
- sleep:
29+
duration: 10s
30+
2631
- name: 'Confirm cluster is created'
2732
use:
2833
template: '../templates/confirm-created.yaml'
2934

35+
- name: Sleep for 10s
36+
try:
37+
- sleep:
38+
duration: 10s
39+
3040
- name: 'Confirm Replica backup completed'
3141
use:
3242
template: '../templates/replica-backup-complete.yaml'
3343

44+
- name: Sleep for 10s
45+
try:
46+
- sleep:
47+
duration: 10s
3448

3549
- name: Verify COMMAND_OPTS matches "--stanza=db --repo=1"
3650
bindings:
@@ -60,7 +74,7 @@ spec:
6074
- -o
6175
- jsonpath="{.items[*].spec.containers[*].env[?(@.name=='COMMAND_OPTS')].value}"
6276
check:
63-
($stdout): '"--stanza=db --repo=1"'
77+
(contains($stdout, '--stanza=db --repo=1')): true
6478
---
6579
apiVersion: chainsaw.kyverno.io/v1alpha1
6680
kind: Test
@@ -83,14 +97,24 @@ spec:
8397

8498
steps:
8599

86-
- name: 'Create Cluster with PGO CLI'
100+
- name: 'Create Cluster from manifest'
87101
use:
88102
template: '../templates/create-cluster-from-manifest.yaml'
89103

104+
- name: Sleep for 10s
105+
try:
106+
- sleep:
107+
duration: 10s
108+
90109
- name: 'Confirm cluster is created'
91110
use:
92111
template: '../templates/confirm-created.yaml'
93112

113+
- name: "Sleep 10s"
114+
try:
115+
- sleep:
116+
duration: 10s
117+
94118
- name: 'Confirm Replica backup completed'
95119
use:
96120
template: '../templates/replica-backup-complete.yaml'
@@ -116,6 +140,11 @@ spec:
116140
- sleep:
117141
duration: 10s
118142

143+
- name: "Sleep 10s"
144+
try:
145+
- sleep:
146+
duration: 10s
147+
119148
- name: Verify COMMAND_OPTS matches "--stanza=db --repo=1 --type=full"
120149
bindings:
121150
- name: selector
@@ -184,14 +213,24 @@ spec:
184213

185214
steps:
186215

187-
- name: 'Create Cluster with PGO CLI'
216+
- name: 'Create Cluster from manifest'
188217
use:
189218
template: '../templates/create-cluster-from-manifest.yaml'
190219

220+
- name: Sleep for 10s
221+
try:
222+
- sleep:
223+
duration: 10s
224+
191225
- name: 'Confirm cluster is created'
192226
use:
193227
template: '../templates/confirm-created.yaml'
194228

229+
- name: "Sleep 30s"
230+
try:
231+
- sleep:
232+
duration: 30s
233+
195234
- name: 'Confirm Replica backup completed'
196235
use:
197236
template: '../templates/replica-backup-complete.yaml'
@@ -285,18 +324,33 @@ spec:
285324

286325
steps:
287326

288-
- name: 'Create Cluster with PGO CLI'
327+
- name: 'Create Cluster from manifest'
289328
use:
290329
template: '../templates/create-cluster-from-manifest.yaml'
291330

331+
- name: Sleep for 10s
332+
try:
333+
- sleep:
334+
duration: 10s
335+
292336
- name: 'Confirm cluster is created'
293337
use:
294338
template: '../templates/confirm-created.yaml'
295339

340+
- name: Sleep for 10s
341+
try:
342+
- sleep:
343+
duration: 10s
344+
296345
- name: 'Confirm Replica backup completed'
297346
use:
298347
template: '../templates/replica-backup-complete.yaml'
299348

349+
- name: "Sleep 10s"
350+
try:
351+
- sleep:
352+
duration: 10s
353+
300354
- name: Trigger a backup through CLI with multiple flags
301355
try:
302356
- command:
@@ -388,18 +442,33 @@ spec:
388442

389443
steps:
390444

391-
- name: 'Create Cluster with PGO CLI'
445+
- name: 'Create Cluster from manifest'
392446
use:
393447
template: '../templates/create-cluster-from-manifest.yaml'
394448

449+
- name: Sleep for 10s
450+
try:
451+
- sleep:
452+
duration: 10s
453+
395454
- name: 'Confirm cluster is created'
396455
use:
397456
template: '../templates/confirm-created.yaml'
398457

458+
- name: Sleep for 10s
459+
try:
460+
- sleep:
461+
duration: 10s
462+
399463
- name: 'Confirm Replica backup completed'
400464
use:
401465
template: '../templates/replica-backup-complete.yaml'
402466

467+
- name: Sleep for 10s
468+
try:
469+
- sleep:
470+
duration: 10s
471+
403472
- name: Trigger a backup through CLI with no flags
404473
try:
405474
- description: Get prior annotation
@@ -535,18 +604,33 @@ spec:
535604

536605
steps:
537606

538-
- name: 'Create Cluster with PGO CLI'
607+
- name: 'Create Cluster from manifest'
539608
use:
540609
template: '../templates/create-cluster-from-manifest.yaml'
610+
611+
- name: Sleep for 10s
612+
try:
613+
- sleep:
614+
duration: 10s
541615

542616
- name: 'Confirm cluster is created'
543617
use:
544618
template: '../templates/confirm-created.yaml'
619+
620+
- name: Sleep for 10s
621+
try:
622+
- sleep:
623+
duration: 10s
545624

546625
- name: 'Confirm Replica backup completed'
547626
use:
548627
template: '../templates/replica-backup-complete.yaml'
549628

629+
- name: Sleep for 10s
630+
try:
631+
- sleep:
632+
duration: 10s
633+
550634
- name: Change ownership of spec.backups.pgbackrest.manual.repoName
551635
try:
552636
- script:

‎testing/chainsaw/e2e/create/chainsaw-test.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,20 @@ spec:
3636
use:
3737
template: '../templates/create-cluster.yaml'
3838

39+
- name: Sleep for 30s
40+
try:
41+
- sleep:
42+
duration: 30s
43+
3944
- name: 'Confirm cluster is created'
4045
use:
4146
template: '../templates/confirm-created.yaml'
4247

48+
- name: Sleep for 30s
49+
try:
50+
- sleep:
51+
duration: 30s
52+
4353
- name: 'Confirm Replica backup completed'
4454
use:
4555
template: '../templates/replica-backup-complete.yaml'
@@ -96,10 +106,20 @@ spec:
96106
use:
97107
template: '../templates/create-cluster-without-backups.yaml'
98108

109+
- name: Sleep for 10s
110+
try:
111+
- sleep:
112+
duration: 10s
113+
99114
- name: 'Confirm cluster is created'
100115
use:
101116
template: '../templates/confirm-created.yaml'
102117

118+
- name: Sleep for 10s
119+
try:
120+
- sleep:
121+
duration: 10s
122+
103123
- name: 'Verify Postgres is running correct version'
104124
description: >
105125
Confirm that Postgres is running and using the expected version

‎testing/chainsaw/e2e/delete/chainsaw-test.yaml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ spec:
1111

1212
steps:
1313

14-
- name: 'Create Cluster with PGO CLI'
14+
- name: 'Create Cluster from manifest'
1515
use:
16-
template: '../templates/create-cluster.yaml'
16+
template: '../templates/create-cluster-from-manifest.yaml'
1717

1818
- name: run 'delete cluster' with confirm 'n'
1919
try:
@@ -53,9 +53,9 @@ spec:
5353

5454
steps:
5555

56-
- name: 'Create Cluster with PGO CLI'
56+
- name: 'Create Cluster from manifest'
5757
use:
58-
template: '../templates/create-cluster.yaml'
58+
template: '../templates/create-cluster-from-manifest.yaml'
5959

6060
- name: run 'delete cluster' with confirm 'y'
6161
try:
@@ -71,10 +71,15 @@ spec:
7171
- "echo 'y' | kubectl pgo delete postgrescluster $CLUSTER --namespace=$NAMESPACE"
7272
timeout: 10s
7373

74+
- name: "Sleep 60s"
75+
try:
76+
- sleep:
77+
duration: 60s
78+
7479
- name: confirm cluster deleted
7580
try:
7681
- error:
77-
timeout: 30s
82+
timeout: 500s
7883
resource:
7984
apiVersion: postgres-operator.crunchydata.com/v1beta1
8085
kind: PostgresCluster

‎testing/chainsaw/e2e/show/chainsaw-test.yaml‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,24 @@ spec:
1212

1313
steps:
1414

15-
- name: 'Create Cluster with PGO CLI'
15+
- name: 'Create Cluster from manifest'
1616
use:
17-
template: '../templates/create-cluster.yaml'
17+
template: '../templates/create-cluster-from-manifest.yaml'
1818

19+
- name: "Sleep 30s"
20+
try:
21+
- sleep:
22+
duration: 30s
23+
1924
- name: 'Confirm cluster is created'
2025
use:
2126
template: '../templates/confirm-created.yaml'
2227

28+
- name: "Sleep 30s"
29+
try:
30+
- sleep:
31+
duration: 30s
32+
2333
- name: 'Confirm Replica backup completed'
2434
use:
2535
template: '../templates/replica-backup-complete.yaml'
@@ -89,6 +99,10 @@ spec:
8999
90100
exit 1
91101
102+
- name: "Sleep 30s"
103+
try:
104+
- sleep:
105+
duration: 30s
92106

93107
- name: Show pgbackrest info output json
94108
try:
@@ -157,6 +171,11 @@ spec:
157171
158172
exit 1
159173
174+
- name: "Sleep 30s"
175+
try:
176+
- sleep:
177+
duration: 30s
178+
160179

161180
- name: Show patronictl list
162181
try:
@@ -190,6 +209,11 @@ spec:
190209
191210
exit 1
192211
212+
- name: "Sleep 30s"
213+
try:
214+
- sleep:
215+
duration: 30s
216+
193217

194218
- name: Show patronictl list output json
195219
try:
@@ -223,6 +247,11 @@ spec:
223247
224248
exit 1
225249
250+
- name: "Sleep 30s"
251+
try:
252+
- sleep:
253+
duration: 30s
254+
226255
- name: Show patronictl list output bad
227256
try:
228257
- script:

0 commit comments

Comments
 (0)