From 50a2d7d2427b41c8f994e099408c64d6bc89438e Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Fri, 20 Jan 2023 16:54:06 +0100 Subject: [PATCH] Tweak tests so s3 buckets have unique names --- .../aws_ssm_integration_test_setup.yml | 1 + .../aws_ssm_integration_test_setup.yml | 1 + .../aws_ssm_integration_test_setup.yml | 1 + .../targets/setup_connection_aws_ssm/defaults/main.yml | 7 +------ 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/integration/targets/connection_aws_ssm_addressing/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_addressing/aws_ssm_integration_test_setup.yml index 1d7f8d4f0e2..db519fb631e 100644 --- a/tests/integration/targets/connection_aws_ssm_addressing/aws_ssm_integration_test_setup.yml +++ b/tests/integration/targets/connection_aws_ssm_addressing/aws_ssm_integration_test_setup.yml @@ -6,3 +6,4 @@ encrypted_bucket: False s3_bucket_region: 'eu-central-1' s3_addressing_style: virtual + test_suffix: addressing diff --git a/tests/integration/targets/connection_aws_ssm_encrypted_s3/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_encrypted_s3/aws_ssm_integration_test_setup.yml index 6206976f1a7..bfea0d0dc79 100644 --- a/tests/integration/targets/connection_aws_ssm_encrypted_s3/aws_ssm_integration_test_setup.yml +++ b/tests/integration/targets/connection_aws_ssm_encrypted_s3/aws_ssm_integration_test_setup.yml @@ -4,3 +4,4 @@ vars: target_os: fedora encrypted_bucket: True + test_suffix: encrypteds3 diff --git a/tests/integration/targets/connection_aws_ssm_ssm_document/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_ssm_document/aws_ssm_integration_test_setup.yml index 018af40eb77..992426976b8 100644 --- a/tests/integration/targets/connection_aws_ssm_ssm_document/aws_ssm_integration_test_setup.yml +++ b/tests/integration/targets/connection_aws_ssm_ssm_document/aws_ssm_integration_test_setup.yml @@ -4,3 +4,4 @@ vars: target_os: fedora use_ssm_document: True + test_suffix: document diff --git a/tests/integration/targets/setup_connection_aws_ssm/defaults/main.yml b/tests/integration/targets/setup_connection_aws_ssm/defaults/main.yml index 7eb6f04b84e..ec7cf0ec6dc 100644 --- a/tests/integration/targets/setup_connection_aws_ssm/defaults/main.yml +++ b/tests/integration/targets/setup_connection_aws_ssm/defaults/main.yml @@ -40,11 +40,6 @@ ami_details: os_type: windows -# see: -# - https://github.com/mattclay/aws-terminator/pull/181 -# - https://github.com/ansible-collections/community.aws/pull/763 -encrypted_s3_bucket_name: ssm-encrypted-test-bucket - -s3_bucket_name: "{{ resource_prefix }}-connection-ssm" +s3_bucket_name: "{{ tiny_prefix }}-connection-ssm-{{ test_suffix | default(target_os) }}" kms_key_name: "{{ resource_prefix }}-connection-ssm" ssm_document_name: "{{ resource_prefix }}-connection-ssm"