diff options
| author | kjnilsson <knilsson@pivotal.io> | 2020-07-15 14:02:20 +0100 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2020-09-07 09:42:10 +0100 |
| commit | 91f80c55ad9ff9df33dfb77ee5cce07b569eeb69 (patch) | |
| tree | 54be061f3b2b03ffc77d6e8baa96ed49f4386a45 | |
| parent | 5b74022419a35af1950dadfa1a60113179c205e0 (diff) | |
| download | rabbitmq-server-git-91f80c55ad9ff9df33dfb77ee5cce07b569eeb69.tar.gz | |
quorum_queue_SUITE skip 2 node tests for mixed versions
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index d438978010..f4897a00c0 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -165,38 +165,44 @@ init_per_group(Group, Config) -> cluster_size_3 -> 3; cluster_size_5 -> 5 end, - Config1 = rabbit_ct_helpers:set_config(Config, - [{rmq_nodes_count, ClusterSize}, - {rmq_nodename_suffix, Group}, - {tcp_ports_base}]), - Config1b = rabbit_ct_helpers:set_config(Config1, [{net_ticktime, 10}]), - Ret = rabbit_ct_helpers:run_steps(Config1b, - [fun merge_app_env/1 ] ++ - rabbit_ct_broker_helpers:setup_steps()), - case Ret of - {skip, _} -> - Ret; - Config2 -> - EnableFF = rabbit_ct_broker_helpers:enable_feature_flag( - Config2, quorum_queue), - case EnableFF of - ok -> - ok = rabbit_ct_broker_helpers:rpc( - Config2, 0, application, set_env, - [rabbit, channel_tick_interval, 100]), - %% HACK: the larger cluster sizes benefit for a bit - %% more time after clustering before running the - %% tests. - case Group of - cluster_size_5 -> - timer:sleep(5000), - Config2; - _ -> - Config2 - end; - Skip -> - end_per_group(Group, Config2), - Skip + IsMixed = not (false == os:getenv("SECONDARY_UMBRELLA")), + case ClusterSize of + 2 when IsMixed -> + {skip, "cluster size 2 isn't mixed versions compatible"}; + _ -> + Config1 = rabbit_ct_helpers:set_config(Config, + [{rmq_nodes_count, ClusterSize}, + {rmq_nodename_suffix, Group}, + {tcp_ports_base}]), + Config1b = rabbit_ct_helpers:set_config(Config1, [{net_ticktime, 10}]), + Ret = rabbit_ct_helpers:run_steps(Config1b, + [fun merge_app_env/1 ] ++ + rabbit_ct_broker_helpers:setup_steps()), + case Ret of + {skip, _} -> + Ret; + Config2 -> + EnableFF = rabbit_ct_broker_helpers:enable_feature_flag( + Config2, quorum_queue), + case EnableFF of + ok -> + ok = rabbit_ct_broker_helpers:rpc( + Config2, 0, application, set_env, + [rabbit, channel_tick_interval, 100]), + %% HACK: the larger cluster sizes benefit for a bit + %% more time after clustering before running the + %% tests. + case Group of + cluster_size_5 -> + timer:sleep(5000), + Config2; + _ -> + Config2 + end; + Skip -> + end_per_group(Group, Config2), + Skip + end end end. |