From dec94e67502cd42725efeecc0dffa5b167416c58 Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 11 Jul 2024 12:19:17 +0530 Subject: [PATCH] Switch from t3.micro to t3a.micro in some of the integratin tests --- changelogs/fragments/use_t3a_micro_in_tests.yml | 3 +++ .../targets/ec2_instance_instance_minimal/defaults/main.yml | 2 +- .../targets/ec2_instance_instance_multiple/defaults/main.yml | 2 +- .../targets/ec2_instance_instance_no_wait/defaults/main.yml | 2 +- .../ec2_instance_license_specifications/defaults/main.yml | 2 +- .../targets/ec2_instance_metadata_options/defaults/main.yml | 2 +- .../targets/ec2_instance_security_group/defaults/main.yml | 2 +- .../ec2_instance_state_config_updates/defaults/main.yml | 2 +- .../ec2_instance_tags_and_vpc_settings/defaults/main.yml | 2 +- .../ec2_instance_termination_protection/defaults/main.yml | 2 +- .../integration/targets/ec2_instance_uptime/defaults/main.yml | 2 +- 11 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 changelogs/fragments/use_t3a_micro_in_tests.yml diff --git a/changelogs/fragments/use_t3a_micro_in_tests.yml b/changelogs/fragments/use_t3a_micro_in_tests.yml new file mode 100644 index 00000000000..b913ae5baa1 --- /dev/null +++ b/changelogs/fragments/use_t3a_micro_in_tests.yml @@ -0,0 +1,3 @@ +--- +trivial: + - Switch to using t3a.micro in amazon.aws tests to avoid intermittent failures. diff --git a/tests/integration/targets/ec2_instance_instance_minimal/defaults/main.yml b/tests/integration/targets/ec2_instance_instance_minimal/defaults/main.yml index 894eb9a726a..98104ce70ac 100644 --- a/tests/integration/targets/ec2_instance_instance_minimal/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_instance_minimal/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_minimal -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-minimal" diff --git a/tests/integration/targets/ec2_instance_instance_multiple/defaults/main.yml b/tests/integration/targets/ec2_instance_instance_multiple/defaults/main.yml index e5bb5329a71..2c916eccc8f 100644 --- a/tests/integration/targets/ec2_instance_instance_multiple/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_instance_multiple/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_multiple -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-multiple" diff --git a/tests/integration/targets/ec2_instance_instance_no_wait/defaults/main.yml b/tests/integration/targets/ec2_instance_instance_no_wait/defaults/main.yml index a393cf7443f..21e78d90675 100644 --- a/tests/integration/targets/ec2_instance_instance_no_wait/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_instance_no_wait/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_no_wait -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-no-wait" diff --git a/tests/integration/targets/ec2_instance_license_specifications/defaults/main.yml b/tests/integration/targets/ec2_instance_license_specifications/defaults/main.yml index 37d7ae69a85..8798ab5ffda 100644 --- a/tests/integration/targets/ec2_instance_license_specifications/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_license_specifications/defaults/main.yml @@ -1,6 +1,6 @@ --- # defaults file for ec2_instance_block_devices -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-license-specifications" ec2_host_resource_group_arn: arn:aws:resource-groups:{{ aws_region }}:123456789012:group/{{ resource_prefix }}-resource-group ec2_license_configuration_arn: arn:aws:license-manager:{{ aws_region }}:123456789012:license-configuration:lic-0123456789 diff --git a/tests/integration/targets/ec2_instance_metadata_options/defaults/main.yml b/tests/integration/targets/ec2_instance_metadata_options/defaults/main.yml index 95374fa3ff0..75a131696ff 100644 --- a/tests/integration/targets/ec2_instance_metadata_options/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_metadata_options/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_metadata_options -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-metadata" diff --git a/tests/integration/targets/ec2_instance_security_group/defaults/main.yml b/tests/integration/targets/ec2_instance_security_group/defaults/main.yml index 0ad78f0fc42..542106868ff 100644 --- a/tests/integration/targets/ec2_instance_security_group/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_security_group/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_security_group -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-sg" diff --git a/tests/integration/targets/ec2_instance_state_config_updates/defaults/main.yml b/tests/integration/targets/ec2_instance_state_config_updates/defaults/main.yml index 064491b40b2..652b82b1ebf 100644 --- a/tests/integration/targets/ec2_instance_state_config_updates/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_state_config_updates/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_state_config_updates -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-state-config-updates" diff --git a/tests/integration/targets/ec2_instance_tags_and_vpc_settings/defaults/main.yml b/tests/integration/targets/ec2_instance_tags_and_vpc_settings/defaults/main.yml index a06c0513578..c8cf7e27fd5 100644 --- a/tests/integration/targets/ec2_instance_tags_and_vpc_settings/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_tags_and_vpc_settings/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_tags_and_vpc_settings -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-tags-vpc" diff --git a/tests/integration/targets/ec2_instance_termination_protection/defaults/main.yml b/tests/integration/targets/ec2_instance_termination_protection/defaults/main.yml index b24f13e3f99..f7ca95e8768 100644 --- a/tests/integration/targets/ec2_instance_termination_protection/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_termination_protection/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_termination_protection -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-temination" diff --git a/tests/integration/targets/ec2_instance_uptime/defaults/main.yml b/tests/integration/targets/ec2_instance_uptime/defaults/main.yml index 820e3c83186..f74164da1c4 100644 --- a/tests/integration/targets/ec2_instance_uptime/defaults/main.yml +++ b/tests/integration/targets/ec2_instance_uptime/defaults/main.yml @@ -1,4 +1,4 @@ --- # defaults file for ec2_instance_uptime -ec2_instance_type: t3.micro +ec2_instance_type: t3a.micro ec2_instance_tag_TestId: "{{ resource_prefix }}-instance-uptime"