Merge snapshot tests, and fix unreasonable timeout values. (#57)

kyriechen96 · web-flow · commit f6d0b7fe2c68 · 2023-03-07T02:19:49.000Z
Issue #, if available:
Snapshot tests creates 3 clusters. Reduce cluster creations to 2.
Some timeout values are not reasonable.

Description of changes:
Merge snapshot_validate_tags.yaml into other snapshot test.
Reduce timeout value of terminal cases to 60.
Reduce timeout value of tags update to 10.
Reduce timeout value of some huge wait time.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/test/e2e/scenarios/ACL/acl_terminal_condition.yaml b/test/e2e/scenarios/ACL/acl_terminal_condition.yaml
@@ -46,7 +46,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 180
+            timeout: 60
   - id: "UPDATE_ACL_VALID"
     description: "Update userNames"
     patch:
@@ -87,7 +87,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 180
+            timeout: 60
     expect_aws:
       UserNames:
         - 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
@@ -74,7 +74,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -104,7 +104,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -130,7 +130,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
diff --git a/test/e2e/scenarios/Cluster/cluster_create_update.yaml b/test/e2e/scenarios/Cluster/cluster_create_update.yaml
@@ -28,7 +28,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 7200
+            timeout: 1800
     expect_k8s:
       spec:
         name: cluster$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
@@ -28,7 +28,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 7200
+            timeout: 3600
     expect_k8s:
       spec:
         name: cluster$RANDOM_SUFFIX
@@ -55,7 +55,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 10000
+            timeout: 3600
     expect_k8s:
       spec:
         nodeType: db.t4g.medium
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
@@ -28,7 +28,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 7200
+            timeout: 3600
     expect_k8s:
       spec:
         name: cluster$RANDOM_SUFFIX
@@ -55,7 +55,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 10000
+            timeout: 3600
     expect_k8s:
       spec:
         nodeType: db.t4g.small
diff --git a/test/e2e/scenarios/Cluster/cluster_update_with_tags.yaml b/test/e2e/scenarios/Cluster/cluster_update_with_tags.yaml
@@ -22,7 +22,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 1800
+            timeout: 3600
     expect_k8s:
       spec:
         name: cluster$RANDOM_SUFFIX
@@ -46,7 +46,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -76,7 +76,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -102,7 +102,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
diff --git a/test/e2e/scenarios/ParameterGroup/pg_create_terminal_condition.yaml b/test/e2e/scenarios/ParameterGroup/pg_create_terminal_condition.yaml
@@ -21,7 +21,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 300
+            timeout: 60
   - id: "DELETE_PG"
     description: "Delete parameter group"
     delete: pg$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/ParameterGroup/pg_update_with_tags.yaml b/test/e2e/scenarios/ParameterGroup/pg_update_with_tags.yaml
@@ -41,7 +41,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -67,7 +67,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -89,7 +89,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
diff --git a/test/e2e/scenarios/Snapshot/snapshot_copy.yaml b/test/e2e/scenarios/Snapshot/snapshot_copy.yaml
@@ -43,7 +43,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 3600
+            timeout: 1800
     expect_k8s:
       spec:
         sourceSnapshotName: snapshot$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/Snapshot/snapshot_create.yaml b/test/e2e/scenarios/Snapshot/snapshot_create.yaml
diff --git a/test/e2e/scenarios/Snapshot/snapshot_create_terminal_condition.yaml b/test/e2e/scenarios/Snapshot/snapshot_create_terminal_condition.yaml
@@ -18,7 +18,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 600
+            timeout: 60
   - id: "DELETE_SNAPSHOT"
     description: "Delete snapshot"
     delete:
diff --git a/test/e2e/scenarios/Snapshot/snapshot_create_update_with_tags.yaml b/test/e2e/scenarios/Snapshot/snapshot_create_update_with_tags.yaml
@@ -4,53 +4,29 @@ description: "In this test we create snapshot and update tags"
 #  - slow
 #  - blocked
 steps:
-  - id: "CLUSTER_INITIAL_CREATE"
-    description: "Create cluster"
-    create:
-      apiVersion: $CRD_GROUP/$CRD_VERSION
-      kind: Cluster
-      metadata:
-        name: cluster$RANDOM_SUFFIX
-      spec:
-        name: cluster$RANDOM_SUFFIX
-        nodeType: db.t4g.small
-        aclName: open-access
-        numShards: 1
-        snapshotRetentionLimit: 0
-    wait:
-      status:
-        conditions:
-          ACK.ResourceSynced:
-            status: "True"
-            timeout: 1800
-    expect_k8s:
-      spec:
-        name: cluster$RANDOM_SUFFIX
-    expect_aws:
-      Name: cluster$RANDOM_SUFFIX
-  - id: "SNAPSHOT_INITIAL_CREATE"
+  - id: "CREATE_SNAPSHOT"
     description: "Create snapshot with no tags"
     create:
       apiVersion: $CRD_GROUP/$CRD_VERSION
       kind: Snapshot
       metadata:
         name: snapshot$RANDOM_SUFFIX
       spec:
-        clusterName: cluster$RANDOM_SUFFIX
+        clusterName: $SNAPSHOT_CLUSTER_NAME1
         name: snapshot$RANDOM_SUFFIX
     wait:
       status:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 1800
+            timeout: 3600
     expect_k8s:
       spec:
-        clusterName: cluster$RANDOM_SUFFIX
+        clusterName: $SNAPSHOT_CLUSTER_NAME1
         name: snapshot$RANDOM_SUFFIX
     expect_aws:
       ClusterConfiguration:
-        Name: cluster$RANDOM_SUFFIX
+        Name: $SNAPSHOT_CLUSTER_NAME1
       Name: snapshot$RANDOM_SUFFIX
   - id: "SNAPSHOT_ADD_TAGS"
     description: "Add tags in snapshot"
@@ -70,7 +46,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -100,7 +76,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -126,7 +102,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -142,11 +118,4 @@ steps:
       apiVersion: $CRD_GROUP/$CRD_VERSION
       kind: Snapshot
       metadata:
-        name: snapshot$RANDOM_SUFFIX
-  - id: "DELETE_CLUSTER"
-    description: "Delete cluster"
-    delete:
-      apiVersion: $CRD_GROUP/$CRD_VERSION
-      kind: Cluster
-      metadata:
-        name: cluster$RANDOM_SUFFIX
+        name: snapshot$RANDOM_SUFFIX
diff --git a/test/e2e/scenarios/SubnetGroup/subnetgroup_terminal_conditions.yaml b/test/e2e/scenarios/SubnetGroup/subnetgroup_terminal_conditions.yaml
@@ -22,7 +22,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 100
+            timeout: 60
   - id: "UPDATE_SUBNET_VALID"
     description: "Update SubnetGroup SubnetIds"
     patch:
@@ -55,7 +55,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 100
+            timeout: 60
     expect_aws:
       Subnets:
         - Identifier: $SUBNET1
diff --git a/test/e2e/scenarios/SubnetGroup/subnetgroup_update_with_tags.yaml b/test/e2e/scenarios/SubnetGroup/subnetgroup_update_with_tags.yaml
@@ -42,7 +42,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -68,7 +68,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
@@ -90,7 +90,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 100
+            timeout: 10
     expect_k8s:
       spec:
         tags:
diff --git a/test/e2e/scenarios/User/user_create_update.yaml b/test/e2e/scenarios/User/user_create_update.yaml
@@ -48,7 +48,7 @@ steps:
         conditions:
           ACK.ResourceSynced:
             status: "True"
-            timeout: 190
+            timeout: 180
     expect_k8s:
       spec:
         accessString: off resetchannels -@all +get
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: 60
   - id: "USER_UPDATE_ACCESS_STRING"
     description: "Update AccessString"
     patch:
@@ -54,7 +54,7 @@ steps:
         conditions:
           ACK.Terminal:
             status: "True"
-            timeout: 100
+            timeout: 60
     expect_aws:
       AccessString: off resetchannels -@all +get
   - id: "DELETE_USER"
diff --git a/test/e2e/scenarios/User/user_update_with_tags.yaml b/test/e2e/scenarios/User/user_update_with_tags.yaml
