Skip to content

Commit c5c60a0

Browse files
author
Kyrie Chen
committed
Fixes flaky tests
1 parent d2483d2 commit c5c60a0

15 files changed

+82
-90
lines changed

‎test/e2e/bootstrap_resources.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class BootstrapResources(Resources):
3535
KMSKey: KMS
3636
Cluster1: Cluster
3737
Cluster2: Cluster
38+
Cluster3: Cluster
3839

3940
_bootstrap_resources = None
4041

‎test/e2e/replacement_values.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
"TOPIC2": get_bootstrap_resources().Topic2.topic_arn,
2525
"KMSKEY": get_bootstrap_resources().KMSKey.key,
2626
"SNAPSHOT_CLUSTER_NAME1": get_bootstrap_resources().Cluster1.clusterName,
27-
"SNAPSHOT_CLUSTER_NAME2": get_bootstrap_resources().Cluster2.clusterName
27+
"SNAPSHOT_CLUSTER_NAME2": get_bootstrap_resources().Cluster2.clusterName,
28+
"SNAPSHOT_CLUSTER_NAME3": get_bootstrap_resources().Cluster3.clusterName
2829
}

‎test/e2e/scenarios/ACL/acl_create_update.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ steps:
5858
userNames:
5959
- userone$RANDOM_SUFFIX
6060
- usertwo$RANDOM_SUFFIX
61-
wait:
61+
wait: 180
62+
expect:
6263
status:
6364
conditions:
6465
ACK.ResourceSynced:
6566
status: "True"
66-
timeout: 180
6767
- id: "UPDATE_ACL"
6868
description: "Update userNames"
6969
patch:

‎test/e2e/scenarios/ACL/acl_terminal_condition.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ description: "In this test we create User and create/update ACL to validate term
44
# - slow
55
# - blocked
66
steps:
7-
- id: "USER_ONE_CREATE"
8-
description: "Create User One"
7+
- id: "USER_CREATE"
8+
description: "Create User"
99
create:
1010
apiVersion: $CRD_GROUP/$CRD_VERSION
1111
kind: User
1212
metadata:
13-
name: userone$RANDOM_SUFFIX
13+
name: user$RANDOM_SUFFIX
1414
spec:
15-
name: userone$RANDOM_SUFFIX
15+
name: user$RANDOM_SUFFIX
1616
accessString: on +get
1717
authenticationMode:
1818
type_: password
@@ -42,7 +42,7 @@ steps:
4242
ACK.Terminal:
4343
status: "True"
4444
timeout: 180
45-
- id: "UPDATE_ACL"
45+
- id: "UPDATE_ACL_VALID"
4646
description: "Update userNames"
4747
patch:
4848
apiVersion: $CRD_GROUP/$CRD_VERSION
@@ -51,14 +51,14 @@ steps:
5151
name: acl$RANDOM_SUFFIX
5252
spec:
5353
userNames:
54-
- userone$RANDOM_SUFFIX
55-
wait:
54+
- user$RANDOM_SUFFIX
55+
wait: 180
56+
expect:
5657
status:
5758
conditions:
5859
ACK.ResourceSynced:
5960
status: "True"
60-
timeout: 180
61-
- id: "UPDATE_ACL"
61+
- id: "UPDATE_ACL_INVALID"
6262
description: "Update userNames to invalid"
6363
patch:
6464
apiVersion: $CRD_GROUP/$CRD_VERSION
@@ -81,10 +81,10 @@ steps:
8181
kind: ACL
8282
metadata:
8383
name: acl$RANDOM_SUFFIX
84-
- id: "USER_DELETE_ONE"
85-
description: "Delete User one"
84+
- id: "USER_DELETE"
85+
description: "Delete User"
8686
delete:
8787
apiVersion: $CRD_GROUP/$CRD_VERSION
8888
kind: User
8989
metadata:
90-
name: userone$RANDOM_SUFFIX
90+
name: user$RANDOM_SUFFIX

‎test/e2e/scenarios/ACL/acl_update_with_tags.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ steps:
3636
name: acl$RANDOM_SUFFIX
3737
userNames:
3838
- user$RANDOM_SUFFIX
39-
wait:
39+
wait: 180
40+
expect:
4041
status:
4142
conditions:
4243
ACK.ResourceSynced:
4344
status: "True"
44-
timeout: 180
4545
- id: "ACL_ADD_TAGS"
4646
description: "Add tags in ACL"
4747
patch:
@@ -60,7 +60,7 @@ steps:
6060
conditions:
6161
ACK.ResourceSynced:
6262
status: "True"
63-
timeout: 100
63+
timeout: 180
6464
- id: "ACL_DELETE_TAGS"
6565
description: "Delete tags in ACL"
6666
patch:
@@ -77,7 +77,7 @@ steps:
7777
conditions:
7878
ACK.ResourceSynced:
7979
status: "True"
80-
timeout: 100
80+
timeout: 180
8181
- id: "ACL_ADD_AND_DELETE_TAGS"
8282
description: "Add some tags and delete some tags in ACL"
8383
patch:
@@ -94,7 +94,7 @@ steps:
9494
conditions:
9595
ACK.ResourceSynced:
9696
status: "True"
97-
timeout: 100
97+
timeout: 180
9898
- id: "ACL_DELETE"
9999
description: "Delete ACL"
100100
delete:

‎test/e2e/scenarios/Cluster/cluster_create_update.yaml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
id: "CREATE_UPDATE"
1+
id: "CLUSTER_CREATE_UPDATE"
22
description: "In this test we create Cluster and update it"
33
#marks:
44
# - slow
@@ -63,15 +63,15 @@ steps:
6363
status: "True"
6464
timeout: 7200
6565

66-
- id: "USER_ONE_CREATE"
67-
description: "Create User ONE"
66+
- id: "USER_CREATE"
67+
description: "Create User"
6868
create:
6969
apiVersion: $CRD_GROUP/$CRD_VERSION
7070
kind: User
7171
metadata:
72-
name: userone$RANDOM_SUFFIX
72+
name: user$RANDOM_SUFFIX
7373
spec:
74-
name: userone$RANDOM_SUFFIX
74+
name: user$RANDOM_SUFFIX
7575
accessString: on +get
7676
authenticationMode:
7777
type_: password
@@ -94,13 +94,13 @@ steps:
9494
spec:
9595
name: acl$RANDOM_SUFFIX
9696
userNames:
97-
- userone$RANDOM_SUFFIX
98-
wait:
97+
- user$RANDOM_SUFFIX
98+
wait: 180
99+
expect:
99100
status:
100101
conditions:
101102
ACK.ResourceSynced:
102103
status: "True"
103-
timeout: 180
104104

105105
- id: "UPDATE_ACL"
106106
description: "Update ACL"
@@ -116,7 +116,7 @@ steps:
116116
conditions:
117117
ACK.ResourceSynced:
118118
status: "True"
119-
timeout: 7200
119+
timeout: 180
120120

121121
- id: "PG_INITIAL_CREATE"
122122
description: "PG with activerehashing as no"
@@ -137,7 +137,7 @@ steps:
137137
conditions:
138138
ACK.ResourceSynced:
139139
status: "True"
140-
timeout: 100
140+
timeout: 180
141141

142142
- id: "UPDATE_PG"
143143
description: "Update PG"
@@ -153,7 +153,7 @@ steps:
153153
conditions:
154154
ACK.ResourceSynced:
155155
status: "True"
156-
timeout: 7200
156+
timeout: 180
157157

158158
- id: "DELETE_CLUSTER"
159159
description: "Delete the cluster"
@@ -177,17 +177,10 @@ steps:
177177
kind: ACL
178178
metadata:
179179
name: acl$RANDOM_SUFFIX
180-
- id: "USER_DELETE_ONE"
181-
description: "Delete User one"
182-
delete:
183-
apiVersion: $CRD_GROUP/$CRD_VERSION
184-
kind: User
185-
metadata:
186-
name: userone$RANDOM_SUFFIX
187-
- id: "USER_DELETE_TWO"
188-
description: "Delete User two"
180+
- id: "USER_DELETE"
181+
description: "Delete User"
189182
delete:
190183
apiVersion: $CRD_GROUP/$CRD_VERSION
191184
kind: User
192185
metadata:
193-
name: usertwo$RANDOM_SUFFIX
186+
name: user$RANDOM_SUFFIX

‎test/e2e/scenarios/Cluster/cluster_scale_in_scale_up_increase_replica.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
id: "SCALE_IN_SCALE_UP_INCREASE_REPLICA"
1+
id: "CLUSTER_SCALE_IN_SCALE_UP_INCREASE_REPLICA"
22
description: "In this test we create Cluster and update scale in, scale up and increase replica"
33
#marks:
44
# - slow

‎test/e2e/scenarios/Cluster/cluster_scale_out_scale_down_decrease_replica.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
id: "SCALE_OUT_SCALE_DOWN_DECREASE_REPLICA"
1+
id: "CLUSTER_SCALE_OUT_SCALE_DOWN_DECREASE_REPLICA"
22
description: "In this test we create Cluster and update scale out, scale down and decrease replica"
33
#marks:
44
# - slow

‎test/e2e/scenarios/Snapshot/snapshot_copy.yaml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ steps:
1414
spec:
1515
clusterName: $SNAPSHOT_CLUSTER_NAME2
1616
name: snapshot$RANDOM_SUFFIX
17-
wait:
17+
wait: 3600
18+
expect:
1819
status:
1920
conditions:
2021
ACK.ResourceSynced:
2122
status: "True"
22-
timeout: 3600
2323
- id: "COPY_SNAPSHOT"
2424
description: "Ack Copy Snapshot"
2525
create:
@@ -30,12 +30,12 @@ steps:
3030
spec:
3131
sourceSnapshotName: snapshot$RANDOM_SUFFIX
3232
name: snapshotcopy$RANDOM_SUFFIX
33-
wait:
33+
wait: 3600
34+
expect:
3435
status:
3536
conditions:
3637
ACK.ResourceSynced:
3738
status: "True"
38-
timeout: 3600
3939
- id: "DELETE_COPY_SNAPSHOT"
4040
description: "Ack Delete Copy Snapshot"
4141
delete:
@@ -49,4 +49,11 @@ steps:
4949
apiVersion: $CRD_GROUP/$CRD_VERSION
5050
kind: Snapshot
5151
metadata:
52-
name: snapshot$RANDOM_SUFFIX
52+
name: snapshot$RANDOM_SUFFIX
53+
- id: "DELETE_CLUSTER"
54+
description: "Delete cluster"
55+
delete:
56+
apiVersion: $CRD_GROUP/$CRD_VERSION
57+
kind: Cluster
58+
metadata:
59+
name: $SNAPSHOT_CLUSTER_NAME2

‎test/e2e/scenarios/Snapshot/snapshot_create.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,23 @@ steps:
1414
spec:
1515
clusterName: $SNAPSHOT_CLUSTER_NAME1
1616
name: snapshot$RANDOM_SUFFIX
17-
wait:
17+
wait: 3600
18+
expect:
1819
status:
1920
conditions:
2021
ACK.ResourceSynced:
2122
status: "True"
22-
timeout: 3600
2323
- id: "DELETE_SNAPSHOT"
2424
description: "Delete snapshot"
2525
delete:
2626
apiVersion: $CRD_GROUP/$CRD_VERSION
2727
kind: Snapshot
2828
metadata:
2929
name: snapshot$RANDOM_SUFFIX
30+
- id: "DELETE_CLUSTER"
31+
description: "Delete cluster"
32+
delete:
33+
apiVersion: $CRD_GROUP/$CRD_VERSION
34+
kind: Cluster
35+
metadata:
36+
name: $SNAPSHOT_CLUSTER_NAME1

0 commit comments

Comments
 (0)