From c7a06903900e5b4c839e797bb367b2c9208b280d Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 24 Jun 2024 09:38:11 +0200 Subject: [PATCH] Tests - Replace use of db.t2 instance class Amazon's dropping support for M4/R4/T2 RDS DB instances, replace their use in tests before something suddenly fails. --- .../inventory_aws_rds/playbooks/tasks/rds_instance_create.yml | 2 +- .../playbooks/test_inventory_with_hostvars_prefix_suffix.yml | 2 +- tests/integration/targets/rds_option_group/defaults/main.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/tasks/rds_instance_create.yml b/tests/integration/targets/inventory_aws_rds/playbooks/tasks/rds_instance_create.yml index 827033822b3..402c60fe257 100644 --- a/tests/integration/targets/inventory_aws_rds/playbooks/tasks/rds_instance_create.yml +++ b/tests/integration/targets/inventory_aws_rds/playbooks/tasks/rds_instance_create.yml @@ -3,7 +3,7 @@ amazon.aws.rds_instance: state: present engine: "{{ instance_engine }}" - db_instance_class: db.t2.micro + db_instance_class: db.t3.micro allocated_storage: 20 instance_id: "{{ instance_id }}" master_username: ansibletestuser diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml b/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml index 2051b6d8b08..137a3d23afe 100644 --- a/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml +++ b/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml @@ -23,7 +23,7 @@ - name: assert the hostvars are defined with prefix and/or suffix ansible.builtin.assert: that: - - hostvars[instance_id][vars_prefix+"db_instance_class"+vars_suffix] == 'db.t2.micro' + - hostvars[instance_id][vars_prefix+"db_instance_class"+vars_suffix] == 'db.t3.micro' - hostvars[instance_id][vars_prefix+"engine"+vars_suffix] == instance_engine - hostvars[instance_id][vars_prefix+"db_instance_status"+vars_suffix] in ('available', 'creating') - "'db_instance_class' not in hostvars[instance_id]" diff --git a/tests/integration/targets/rds_option_group/defaults/main.yml b/tests/integration/targets/rds_option_group/defaults/main.yml index 70a5946bf4b..17fa81ef8c8 100644 --- a/tests/integration/targets/rds_option_group/defaults/main.yml +++ b/tests/integration/targets/rds_option_group/defaults/main.yml @@ -6,8 +6,8 @@ option_group_description: "{{ resource_prefix }}rds-option-group test" instance_id: "{{ resource_prefix }}" username: test password: test12345678 -db_instance_class: db.t2.small -storage_encrypted_db_instance_class: db.t2.small +db_instance_class: db.t3.small +storage_encrypted_db_instance_class: db.t3.small allocated_storage: 20 vpc_name: "{{ resource_prefix }}-vpc" vpc_seed: "{{ resource_prefix }}"