rds_cluster: split up the test target (#1175)

rds_cluster: split up the test target

Depends-On: #941
Split up the test target to avoid the parallel execution.

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Gonéri Le Bouder <[email protected]>

changelogs/fragments/rds_cluster_split_functional_tests.yaml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+- "rds_cluster - Split up the functional tests in smaller targets (https://github.com/ansible-collections/amazon.aws/pull/1175)."

tests/integration/targets/rds_cluster/aliases → tests/integration/targets/rds_cluster_create/aliases

@@ -1,5 +1,4 @@
-time=10m
-
+time=20m
 cloud/aws
-
+rds_cluster
 rds_cluster_info

tests/integration/targets/rds_cluster_create/defaults/main.yml

@@ -0,0 +1,11 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-cluster-{{ tiny_prefix }}
+username: testrdsusername
+password: test-rds_password
+engine: aurora
+port: 3306
+tags_create:
+  Name: ansible-test-cluster-{{ tiny_prefix }}
+  Created_By: Ansible_rds_cluster_integration_test

tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create.yml → tests/integration/targets/rds_cluster_create/tasks/main.yaml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      region: '{{ aws_region }}'
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+  block:
   - name: Ensure the resource doesn't exist
     rds_cluster:
       id: '{{ cluster_id }}'

tests/integration/targets/rds_cluster_create_sgs/aliases

@@ -0,0 +1,4 @@
+time=20m
+cloud/aws
+rds_cluster
+rds_cluster_info

tests/integration/targets/rds_cluster/roles/rds_cluster/defaults/main.yml → tests/integration/targets/rds_cluster_create_sgs/defaults/main.yml

@@ -1,26 +1,11 @@
 # defaults file for rds_cluster
 
 # Create cluster
-cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
-  }}
+cluster_id: ansible-test-cluster-{{ tiny_prefix }}
 username: testrdsusername
 password: test-rds_password
 engine: aurora
 port: 3306
-tags_create:
-  Name: ansible-test-cluster-{{ tiny_prefix }}
-  Created_By: Ansible_rds_cluster_integration_test
-
-# Modify cluster
-new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
-new_port: 1155
-new_password: test-rds_password-new
-new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new
-
-# Tag cluster
-tags_patch:
-  Name: '{{ tiny_prefix }}-new'
-  Created_by: Ansible rds_cluster integration tests
 
 # Create cluster in a VPC
 vpc_name: ansible-test-vpc-{{ tiny_prefix }}

tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_create_sgs.yml → tests/integration/targets/rds_cluster_create_sgs/tasks/main.yaml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      region: '{{ aws_region }}'
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+  block:
   - name: Ensure the resource doesn't exist
     rds_cluster:
       id: '{{ cluster_id }}'

tests/integration/targets/rds_cluster_modify/aliases

@@ -0,0 +1,4 @@
+time=20m
+cloud/aws
+rds_cluster
+rds_cluster_info

tests/integration/targets/rds_cluster_modify/defaults/main.yml

@@ -0,0 +1,14 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-cluster-{{ tiny_prefix }}
+username: testrdsusername
+password: test-rds_password
+engine: aurora
+port: 3306
+
+# Modify cluster
+new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
+new_port: 1155
+new_password: test-rds_password-new
+new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_modify.yml → tests/integration/targets/rds_cluster_modify/tasks/main.yaml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      region: '{{ aws_region }}'
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+  block:
   - name: Ensure the resource doesn't exist
     rds_cluster:
       id: '{{ cluster_id }}'

tests/integration/targets/rds_cluster_promote/aliases

@@ -0,0 +1,7 @@
+# TODO: Cannot be tested in the CI because:
+# An error occurred (InvalidParameterValue) when calling the CreateDBCluster operation: Replication from cluster in same region is not supported
+disabled
+time=20m
+cloud/aws
+rds_cluster
+rds_cluster_info

tests/integration/targets/rds_cluster_promote/defaults/main.yml

@@ -0,0 +1,8 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-cluster-{{ tiny_prefix }}
+username: testrdsusername
+password: test-rds_password
+engine: aurora
+port: 3306

tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_promote.yml → tests/integration/targets/rds_cluster_promote/tasks/main.yaml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      region: '{{ aws_region }}'
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+  block:
   - name: Ensure the resource doesn't exist
     rds_cluster:
       id: '{{ cluster_id }}'

tests/integration/targets/rds_cluster_restore/aliases

@@ -0,0 +1,4 @@
+time=20m
+cloud/aws
+rds_cluster
+rds_cluster_info

tests/integration/targets/rds_cluster_restore/defaults/main.yml

@@ -0,0 +1,8 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-cluster-{{ tiny_prefix }}
+username: testrdsusername
+password: test-rds_password
+engine: aurora
+port: 3306

tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_restore.yml → tests/integration/targets/rds_cluster_restore/tasks/main.yaml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      region: '{{ aws_region }}'
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+  block:
   - name: Ensure the resource doesn't exist
     rds_cluster:
       id: '{{ cluster_id }}'

tests/integration/targets/rds_cluster_snapshot/tasks/main.yml

@@ -7,7 +7,6 @@
       security_token: "{{ security_token | default(omit) }}"
   collections:
     - amazon.aws
-
   block:
   - name: Create a source DB cluster
     rds_cluster:
@@ -89,7 +88,7 @@
       - "'engine' in _result_cluster_snapshot"
       - _result_cluster_snapshot.engine == "{{ engine }}"
       # - "'engine_mode' in _result_cluster_snapshot"
-      # - _result_cluster_snapshot.engine_mode == "provisioned"
+      # - _result_cluster_snapshot.engine_mode == "serverless"
       - "'engine_version' in _result_cluster_snapshot"
       - "'iam_database_authentication_enabled' in _result_cluster_snapshot"
       - "'license_model' in _result_cluster_snapshot"
@@ -181,7 +180,7 @@
       - "'engine' in _result_cluster_snapshot"
       - _result_cluster_snapshot.engine == "{{ engine }}"
       # - "'engine_mode' in _result_cluster_snapshot"
-      # - _result_cluster_snapshot.engine_mode == "provisioned"
+      # - _result_cluster_snapshot.engine_mode == "serverless"
       - "'engine_version' in _result_cluster_snapshot"
       - "'iam_database_authentication_enabled' in _result_cluster_snapshot"
       - "'license_model' in _result_cluster_snapshot"
@@ -259,7 +258,7 @@
       - "'engine' in _result_cluster_snapshot"
       - _result_cluster_snapshot.engine == "{{ engine }}"
       # - "'engine_mode' in _result_cluster_snapshot"
-      # - _result_cluster_snapshot.engine_mode == "provisioned"
+      # - _result_cluster_snapshot.engine_mode == "serverless"
       - "'engine_version' in _result_cluster_snapshot"
       - "'iam_database_authentication_enabled' in _result_cluster_snapshot"
       - "'license_model' in _result_cluster_snapshot"
@@ -314,7 +313,7 @@
       - "'engine' in _result_cluster_snapshot"
       - _result_cluster_snapshot.engine == "{{ engine }}"
       # - "'engine_mode' in _result_cluster_snapshot"
-      # - _result_cluster_snapshot.engine_mode == "provisioned"
+      # - _result_cluster_snapshot.engine_mode == "serverless"
       - "'engine_version' in _result_cluster_snapshot"
       - "'iam_database_authentication_enabled' in _result_cluster_snapshot"
       - "'license_model' in _result_cluster_snapshot"
@@ -354,7 +353,7 @@
       - "'engine' in _result_cluster_snapshot"
       - _result_cluster_snapshot.engine == "{{ engine }}"
       # - "'engine_mode' in _result_cluster_snapshot"
-      # - _result_cluster_snapshot.engine_mode == "provisioned"
+      # - _result_cluster_snapshot.engine_mode == "serverless"
       - "'engine_version' in _result_cluster_snapshot"
       - "'iam_database_authentication_enabled' in _result_cluster_snapshot"
       - "'license_model' in _result_cluster_snapshot"

tests/integration/targets/rds_cluster_tag/aliases

@@ -0,0 +1,4 @@
+time=20m
+cloud/aws
+rds_cluster
+rds_cluster_info

tests/integration/targets/rds_cluster_tag/defaults/main.yml

@@ -0,0 +1,17 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-cluster-{{ tiny_prefix }}
+username: testrdsusername
+password: test-rds_password
+engine: aurora
+port: 3306
+tags_create:
+  Name: ansible-test-cluster-{{ tiny_prefix }}
+  Created_By: Ansible_rds_cluster_integration_test
+new_password: test-rds_password-new
+
+# Tag cluster
+tags_patch:
+  Name: '{{ tiny_prefix }}-new'
+  Created_by: Ansible rds_cluster integration tests

tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/test_tag.yml → tests/integration/targets/rds_cluster_tag/tasks/main.yaml

@@ -1,4 +1,10 @@
-- block:
+- module_defaults:
+    group/aws:
+      region: '{{ aws_region }}'
+      aws_access_key: '{{ aws_access_key }}'
+      aws_secret_key: '{{ aws_secret_key }}'
+      security_token: '{{ security_token | default(omit) }}'
+  block:
   - name: Ensure the resource doesn't exist
     rds_cluster:
       id: '{{ cluster_id }}'