Skip to content

Commit 52e80b3

Browse files
michaelklishinmergify[bot]
authored andcommitted
Exclude this Khepri-specific test from mixed version cluster runs
(cherry picked from commit 6b444ae) (cherry picked from commit 2183140)
1 parent fe95111 commit 52e80b3

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

deps/rabbit/src/rabbit_upgrade_preparation.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ list_with_minimum_quorum_for_cli() ->
109109
[#{
110110
<<"readable_name">> => C,
111111
<<"name">> => C,
112-
<<"virtual_host">> => "-",
112+
<<"virtual_host">> => <<"(not applicable)">>,
113113
<<"type">> => process
114114
} || C <- endangered_critical_components()].

deps/rabbit/test/upgrade_preparation_SUITE.erl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,15 @@ end_per_group(_Group, Config) ->
5656
rabbit_ct_broker_helpers:teardown_steps()).
5757

5858

59-
init_per_testcase(TestCase, Config) ->
60-
rabbit_ct_helpers:testcase_started(Config, TestCase),
61-
Config.
59+
init_per_testcase(Testcase, Config) when Testcase == await_quorum_plus_one_rabbitmq_metadata ->
60+
case rabbit_ct_helpers:is_mixed_versions() of
61+
true ->
62+
{skip, "not mixed versions compatible"};
63+
_ ->
64+
rabbit_ct_helpers:testcase_started(Config, Testcase)
65+
end;
66+
init_per_testcase(Testcase, Config) ->
67+
rabbit_ct_helpers:testcase_started(Config, Testcase).
6268

6369
end_per_testcase(TestCase, Config) ->
6470
rabbit_ct_helpers:testcase_finished(Config, TestCase).

0 commit comments

Comments
 (0)