rds_cluster: split up the test target

Split up the test target to avoid the parallel execution.
ansible-collections · Oct 17, 2022 · ffe4f77 · ffe4f77
1 parent b9ee1f6
commit ffe4f77
Show file tree

Hide file tree

Showing 27 changed files with 283 additions and 78 deletions.
diff --git a/tests/integration/targets/rds_cluster/inventory b/tests/integration/targets/rds_cluster/inventory
diff --git a/tests/integration/targets/rds_cluster/main.yml b/tests/integration/targets/rds_cluster/main.yml
diff --git a/tests/integration/targets/rds_cluster/meta/main.yml b/tests/integration/targets/rds_cluster/meta/main.yml
diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/meta/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/meta/main.yml
diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/tasks/main.yml
diff --git a/tests/integration/targets/rds_cluster/roles/rds_cluster/vars/main.yml b/tests/integration/targets/rds_cluster/roles/rds_cluster/vars/main.yml
diff --git a/tests/integration/targets/rds_cluster/runme.sh b/tests/integration/targets/rds_cluster/runme.sh
diff --git a/...s/integration/targets/rds_cluster/aliases → ...ration/targets/rds_cluster_create/aliases b/...s/integration/targets/rds_cluster/aliases → ...ration/targets/rds_cluster_create/aliases
@@ -1,5 +1,4 @@
 time=10m
-
 cloud/aws
-
+rds_cluster
 rds_cluster_info
diff --git a/...uster/roles/rds_cluster/defaults/main.yml → ...gets/rds_cluster_create/defaults/main.yml b/...uster/roles/rds_cluster/defaults/main.yml → ...gets/rds_cluster_create/defaults/main.yml
diff --git a/...r/roles/rds_cluster/tasks/test_create.yml → ...argets/rds_cluster_create/tasks/main.yaml b/...r/roles/rds_cluster/tasks/test_create.yml → ...argets/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 }}'

diff --git a/tests/integration/targets/rds_cluster_create_sgs/aliases b/tests/integration/targets/rds_cluster_create_sgs/aliases
@@ -0,0 +1,4 @@
+time=10m
+cloud/aws
+rds_cluster
+rds_cluster_info
diff --git a/tests/integration/targets/rds_cluster_create_sgs/defaults/main.yml b/tests/integration/targets/rds_cluster_create_sgs/defaults/main.yml
@@ -0,0 +1,37 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ 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 }}
+vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
+subnets:
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}
+
+security_groups:
+- '{{ tiny_prefix }}-sg-1'
+- '{{ tiny_prefix }}-sg-2'
+- '{{ tiny_prefix }}-sg-3'
diff --git a/...les/rds_cluster/tasks/test_create_sgs.yml → ...ts/rds_cluster_create_sgs/tasks/main.yaml b/...les/rds_cluster/tasks/test_create_sgs.yml → ...ts/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 }}'

diff --git a/tests/integration/targets/rds_cluster_modify/aliases b/tests/integration/targets/rds_cluster_modify/aliases
@@ -0,0 +1,4 @@
+time=10m
+cloud/aws
+rds_cluster
+rds_cluster_info
diff --git a/tests/integration/targets/rds_cluster_modify/defaults/main.yml b/tests/integration/targets/rds_cluster_modify/defaults/main.yml
@@ -0,0 +1,37 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ 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 }}
+vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
+subnets:
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}
+
+security_groups:
+- '{{ tiny_prefix }}-sg-1'
+- '{{ tiny_prefix }}-sg-2'
+- '{{ tiny_prefix }}-sg-3'
diff --git a/...r/roles/rds_cluster/tasks/test_modify.yml → ...argets/rds_cluster_modify/tasks/main.yaml b/...r/roles/rds_cluster/tasks/test_modify.yml → ...argets/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 }}'

diff --git a/tests/integration/targets/rds_cluster_promote/aliases b/tests/integration/targets/rds_cluster_promote/aliases
@@ -0,0 +1,4 @@
+time=10m
+cloud/aws
+rds_cluster
+rds_cluster_info
diff --git a/tests/integration/targets/rds_cluster_promote/defaults/main.yml b/tests/integration/targets/rds_cluster_promote/defaults/main.yml
@@ -0,0 +1,37 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ 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 }}
+vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
+subnets:
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}
+
+security_groups:
+- '{{ tiny_prefix }}-sg-1'
+- '{{ tiny_prefix }}-sg-2'
+- '{{ tiny_prefix }}-sg-3'
diff --git a/.../roles/rds_cluster/tasks/test_promote.yml → ...rgets/rds_cluster_promote/tasks/main.yaml b/.../roles/rds_cluster/tasks/test_promote.yml → ...rgets/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 }}'

diff --git a/tests/integration/targets/rds_cluster_restore/aliases b/tests/integration/targets/rds_cluster_restore/aliases
@@ -0,0 +1,4 @@
+time=10m
+cloud/aws
+rds_cluster
+rds_cluster_info
diff --git a/tests/integration/targets/rds_cluster_restore/defaults/main.yml b/tests/integration/targets/rds_cluster_restore/defaults/main.yml
@@ -0,0 +1,37 @@
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ 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 }}
+vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
+subnets:
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}
+
+security_groups:
+- '{{ tiny_prefix }}-sg-1'
+- '{{ tiny_prefix }}-sg-2'
+- '{{ tiny_prefix }}-sg-3'
diff --git a/.../roles/rds_cluster/tasks/test_restore.yml → ...rgets/rds_cluster_restore/tasks/main.yaml b/.../roles/rds_cluster/tasks/test_restore.yml → ...rgets/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 }}'

diff --git a/tests/integration/targets/rds_cluster_snapshot/defaults/main.yml b/tests/integration/targets/rds_cluster_snapshot/defaults/main.yml
@@ -1,13 +1,37 @@
----
-# defaults file for rds_cluster_snapshot
-_resource_prefix: 'ansible-test-{{ tiny_prefix }}'
-
-# Create RDS cluster
-cluster_id: '{{ _resource_prefix }}-rds-cluster'
-username: 'testrdsusername'
-password: "{{ lookup('password', 'dev/null length=12 chars=ascii_letters,digits') }}"
-engine: 'aurora'
+# defaults file for rds_cluster
+
+# Create cluster
+cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ 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 }}
+vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
+subnets:
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
+- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}
 
-# Create snapshot
-snapshot_id: '{{ _resource_prefix }}-rds-cluster-snapshot'
+security_groups:
+- '{{ tiny_prefix }}-sg-1'
+- '{{ tiny_prefix }}-sg-2'
+- '{{ tiny_prefix }}-sg-3'
diff --git a/tests/integration/targets/rds_cluster_snapshot/tasks/main.yml b/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:

diff --git a/tests/integration/targets/rds_cluster_tag/aliases b/tests/integration/targets/rds_cluster_tag/aliases
@@ -0,0 +1,4 @@
+time=10m
+cloud/aws
+rds_cluster
+rds_cluster_info