diff options
author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-05-06 10:08:39 +0200 |
---|---|---|
committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-05-06 10:08:39 +0200 |
commit | 73e3196e1f32f32fca1d75da96acc2bc6aa07e59 (patch) | |
tree | 235035f66219a79b70be20b9cfa6eb57280e6d83 | |
parent | 5729dec49b189a4e6b801803863d372741c3cb4a (diff) | |
download | rabbitmq-server-git-73e3196e1f32f32fca1d75da96acc2bc6aa07e59.tar.gz |
Use non-conflicting aws resource names in integration suite
-rw-r--r-- | .github/workflows/rabbitmq_peer_discovery_aws.yaml | 1 | ||||
-rw-r--r-- | deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/rabbitmq_peer_discovery_aws.yaml b/.github/workflows/rabbitmq_peer_discovery_aws.yaml index ff6678e7f6..82cc6cd682 100644 --- a/.github/workflows/rabbitmq_peer_discovery_aws.yaml +++ b/.github/workflows/rabbitmq_peer_discovery_aws.yaml @@ -65,4 +65,5 @@ jobs: --test_env AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }} \ --test_env AWS_SECRET_ACCESS_KEY=${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }} \ --test_env RABBITMQ_IMAGE="pivotalrabbitmq/rabbitmq:${{ github.sha }}" \ + --test_env AWS_ECS_CLUSTER_NAME=rabbitmq-peer-discovery-aws-actions-${GITHUB_REF##*/} \ --verbose_failures diff --git a/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl b/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl index 4eaea29e38..97130e9c20 100644 --- a/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl +++ b/deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl @@ -47,7 +47,7 @@ init_per_suite(Config) -> Config1 = rabbit_ct_helpers:set_config( Config, [ {ecs_region, "eu-west-1"}, - {ecs_cluster_name, "rabbitmq-peer-discovery-aws"}, + {ecs_cluster_name, os:getenv("AWS_ECS_CLUSTER_NAME", "rabbitmq-peer-discovery-aws")}, {ecs_profile_name, "rabbitmq-peer-discovery-aws-profile"}, {ecs_instance_role, "ecs-peer-discovery-aws"}, {ecs_cluster_size, ?CLUSTER_SIZE}, |