Fixes flaky tests

aws-controllers-k8s · Jan 25, 2023 · 696a07a · 696a07a
1 parent d2483d2
commit 696a07a
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 60 deletions.
diff --git a/test/e2e/scenarios/ACL/acl_create_update.yaml b/test/e2e/scenarios/ACL/acl_create_update.yaml
@@ -58,12 +58,12 @@ steps:
         userNames:
           - userone$RANDOM_SUFFIX
           - usertwo$RANDOM_SUFFIX
-    wait:
+    wait: 180
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 180
   - id: "UPDATE_ACL"
     description: "Update userNames"
     patch:

diff --git a/test/e2e/scenarios/ACL/acl_terminal_condition.yaml b/test/e2e/scenarios/ACL/acl_terminal_condition.yaml
@@ -4,15 +4,15 @@ description: "In this test we create User and create/update ACL to validate term
 #  - slow
 #  - blocked
 steps:
-  - id: "USER_ONE_CREATE"
-    description: "Create User One"
+  - id: "USER_CREATE"
+    description: "Create User"
     create:
       apiVersion: $CRD_GROUP/$CRD_VERSION
       kind: User
       metadata:
-        name: userone$RANDOM_SUFFIX
+        name: user$RANDOM_SUFFIX
       spec:
-        name: userone$RANDOM_SUFFIX
+        name: user$RANDOM_SUFFIX
         accessString: on +get
         authenticationMode:
           type_: password
@@ -42,7 +42,7 @@ steps:
           ACK.Terminal:
             status: "True"
             timeout: 180
-  - id: "UPDATE_ACL"
+  - id: "UPDATE_ACL_VALID"
     description: "Update userNames"
     patch:
       apiVersion: $CRD_GROUP/$CRD_VERSION
@@ -51,14 +51,14 @@ steps:
         name: acl$RANDOM_SUFFIX
       spec:
         userNames:
-          - userone$RANDOM_SUFFIX
-    wait:
+          - user$RANDOM_SUFFIX
+    wait: 180
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 180
-  - id: "UPDATE_ACL"
+  - id: "UPDATE_ACL_INVALID"
     description: "Update userNames to invalid"
     patch:
       apiVersion: $CRD_GROUP/$CRD_VERSION
@@ -81,10 +81,10 @@ steps:
       kind: ACL
       metadata:
         name: acl$RANDOM_SUFFIX
-  - id: "USER_DELETE_ONE"
-    description: "Delete User one"
+  - id: "USER_DELETE"
+    description: "Delete User"
     delete:
       apiVersion: $CRD_GROUP/$CRD_VERSION
       kind: User
       metadata:
-        name: userone$RANDOM_SUFFIX
+        name: user$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/ACL/acl_update_with_tags.yaml b/test/e2e/scenarios/ACL/acl_update_with_tags.yaml
@@ -36,12 +36,12 @@ steps:
         name: acl$RANDOM_SUFFIX
         userNames:
           - user$RANDOM_SUFFIX
-    wait:
+    wait: 180
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 180
   - id: "ACL_ADD_TAGS"
     description: "Add tags in ACL"
     patch:
@@ -60,7 +60,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "ACL_DELETE_TAGS"
     description: "Delete tags in ACL"
     patch:
@@ -77,7 +77,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "ACL_ADD_AND_DELETE_TAGS"
     description: "Add some tags and delete some tags in ACL"
     patch:
@@ -94,7 +94,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "ACL_DELETE"
     description: "Delete ACL"
     delete:

diff --git a/test/e2e/scenarios/Cluster/cluster_create_update.yaml b/test/e2e/scenarios/Cluster/cluster_create_update.yaml
@@ -1,4 +1,4 @@
-id: "CREATE_UPDATE"
+id: "CLUSTER_CREATE_UPDATE"
 description: "In this test we create Cluster and update it"
 #marks:
 #  - slow
@@ -63,15 +63,15 @@ steps:
             status: "True"
             timeout: 7200
 
-  - id: "USER_ONE_CREATE"
-    description: "Create User ONE"
+  - id: "USER_CREATE"
+    description: "Create User"
     create:
       apiVersion: $CRD_GROUP/$CRD_VERSION
       kind: User
       metadata:
-        name: userone$RANDOM_SUFFIX
+        name: user$RANDOM_SUFFIX
       spec:
-        name: userone$RANDOM_SUFFIX
+        name: user$RANDOM_SUFFIX
         accessString: on +get
         authenticationMode:
           type_: password
@@ -94,13 +94,13 @@ steps:
       spec:
         name: acl$RANDOM_SUFFIX
         userNames:
-          - userone$RANDOM_SUFFIX
-    wait:
+          - user$RANDOM_SUFFIX
+    wait: 180
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 180
 
   - id: "UPDATE_ACL"
     description: "Update ACL"
@@ -116,7 +116,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 7200
+            timeout: 180
 
   - id: "PG_INITIAL_CREATE"
     description: "PG with activerehashing as no"
@@ -137,7 +137,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
 
   - id: "UPDATE_PG"
     description: "Update PG"
@@ -153,7 +153,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 7200
+            timeout: 180
 
   - id: "DELETE_CLUSTER"
     description: "Delete the cluster"
@@ -177,17 +177,10 @@ steps:
       kind: ACL
       metadata:
         name: acl$RANDOM_SUFFIX
-  - id: "USER_DELETE_ONE"
-    description: "Delete User one"
-    delete:
-      apiVersion: $CRD_GROUP/$CRD_VERSION
-      kind: User
-      metadata:
-        name: userone$RANDOM_SUFFIX
-  - id: "USER_DELETE_TWO"
-    description: "Delete User two"
+  - id: "USER_DELETE"
+    description: "Delete User"
     delete:
       apiVersion: $CRD_GROUP/$CRD_VERSION
       kind: User
       metadata:
-        name: usertwo$RANDOM_SUFFIX
+        name: user$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/Cluster/cluster_scale_in_scale_up_increase_replica.yaml b/test/e2e/scenarios/Cluster/cluster_scale_in_scale_up_increase_replica.yaml
@@ -1,4 +1,4 @@
-id: "SCALE_IN_SCALE_UP_INCREASE_REPLICA"
+id: "CLUSTER_SCALE_IN_SCALE_UP_INCREASE_REPLICA"
 description: "In this test we create Cluster and update scale in, scale up and increase replica"
 #marks:
 #  - slow

diff --git a/test/e2e/scenarios/Cluster/cluster_scale_out_scale_down_decrease_replica.yaml b/test/e2e/scenarios/Cluster/cluster_scale_out_scale_down_decrease_replica.yaml
@@ -1,4 +1,4 @@
-id: "SCALE_OUT_SCALE_DOWN_DECREASE_REPLICA"
+id: "CLUSTER_SCALE_OUT_SCALE_DOWN_DECREASE_REPLICA"
 description: "In this test we create Cluster and update scale out, scale down and decrease replica"
 #marks:
 #  - slow

diff --git a/test/e2e/scenarios/Snapshot/snapshot_copy.yaml b/test/e2e/scenarios/Snapshot/snapshot_copy.yaml
@@ -14,12 +14,12 @@ steps:
       spec:
         clusterName: $SNAPSHOT_CLUSTER_NAME2
         name: snapshot$RANDOM_SUFFIX
-    wait:
+    wait: 3600
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 3600
   - id: "COPY_SNAPSHOT"
     description: "Ack Copy Snapshot"
     create:

diff --git a/test/e2e/scenarios/Snapshot/snapshot_create.yaml b/test/e2e/scenarios/Snapshot/snapshot_create.yaml
@@ -14,12 +14,12 @@ steps:
       spec:
         clusterName: $SNAPSHOT_CLUSTER_NAME1
         name: snapshot$RANDOM_SUFFIX
-    wait:
+    wait: 3600
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 3600
   - id: "DELETE_SNAPSHOT"
     description: "Delete snapshot"
     delete:

diff --git a/test/e2e/scenarios/Snapshot/snapshot_update_with_tags.yaml b/test/e2e/scenarios/Snapshot/snapshot_update_with_tags.yaml
@@ -16,12 +16,12 @@ steps:
         nodeType: db.t4g.small
         aclName: open-access
         numShards: 1
-    wait:
+    wait: 1200
+    expect:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 7200
   - id: "SNAPSHOT_INITIAL_CREATE"
     description: "Create snapshot with no tags"
     create:

diff --git a/test/e2e/scenarios/User/user_create_update.yaml b/test/e2e/scenarios/User/user_create_update.yaml
@@ -25,7 +25,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_UPDATE_ACCESS_STRING"
     description: "Update AccessString"
     patch:
@@ -36,7 +36,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_UPDATE_PASSWORD"
     description: "Update Password"
     patch:
@@ -51,7 +51,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_UPDATE_ACCESS_STRING_AND_SECRET"
     description: "Update Secret and AccessString"
     patch:
@@ -67,7 +67,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "REAPPLY_SPEC"
     description: "Update Secret and AccessString we should not see any errors"
     patch:
@@ -83,7 +83,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "DELETE_USER"
     description: "Delete User"
     delete: user$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/User/user_terminal_conditions.yaml b/test/e2e/scenarios/User/user_terminal_conditions.yaml
@@ -25,7 +25,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_UPDATE_ACCESS_STRING"
     description: "Update AccessString"
     patch:
@@ -36,7 +36,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_UPDATE_INCORRECT_ACCESS_STRING"
     description: "Update to incorrect access string"
     patch:
@@ -47,7 +47,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "DELETE_USER"
     description: "Delete User"
     delete: user$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/User/user_update_with_tags.yaml b/test/e2e/scenarios/User/user_update_with_tags.yaml
@@ -25,7 +25,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_ADD_TAGS"
     description: "Add tags in User"
     patch:
@@ -40,7 +40,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "USER_DELETE_TAGS"
     description: "Delete tags in User"
     patch:
@@ -53,7 +53,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "SG_ADD_AND_DELETE_TAGS"
     description: "Add some tags and delete some tags in User"
     patch:
@@ -66,7 +66,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 180
   - id: "DELETE_USER"
     description: "Delete User"
     delete: user$RANDOM_SUFFIX