Merge pull request #4406 from rabbitmq/mergify/bp/v3.9.x/pr-4403

Attempt to reduce flakes in aws integration tests (backport #4402) (backport #4403)

Author: michaelklishin

deps/rabbitmq_peer_discovery_aws/test/aws_ecs_util.erl

@@ -169,6 +169,7 @@ ecs_up(Config) ->
     ProfileName = ?config(ecs_profile_name, Config),
     ClusterSize = ?config(ecs_cluster_size, Config),
     UpCmd = [EcsCliCmd, "up",
+             "--force",
              "--instance-role", InstanceRole,
              "--size", integer_to_list(ClusterSize),
              "--instance-type", "t2.medium",

deps/rabbitmq_peer_discovery_aws/test/integration_SUITE.erl

@@ -44,8 +44,9 @@ groups() ->
 init_per_suite(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            %% These test would like passed in mixed versions, but they won't
-            %% actually honor mixed versions as currently specified via env var
+            %% These test would likely pass in mixed versions, but they won't
+            %% actually honor mixed versions like the other suites, as these
+            %% tests are docker image based
             {skip, "not mixed versions compatible"};
         _ ->
             inets:start(),