WIP

Author: lhoguin

.github/workflows/test-make-target.yaml

@@ -78,4 +78,5 @@ jobs:
         path: |
           logs/
           !logs/**/log_private
+          deps/rabbitmq_mqtt/test/java_SUITE_data/target
         if-no-files-found: ignore

deps/rabbitmq_mqtt/test/java_SUITE.erl

@@ -40,9 +40,10 @@ suite() ->
 %% -------------------------------------------------------------------
 
 merge_app_env(Config) ->
-    {ok, Ssl} = q(Config, [erlang_node_config, rabbit, ssl_options]),
+    Ssl = rabbit_ct_helpers:get_app_env(Config, rabbit, ssl_options, []),
     Ssl1 = lists:keyreplace(fail_if_no_peer_cert, 1, Ssl, {fail_if_no_peer_cert, false}),
-    Config1 = rabbit_ct_helpers:merge_app_env(Config, {rabbit, [{ssl_options, Ssl1}]}),
+    Ssl2 = [{versions, ['tlsv1.2']}|Ssl1],
+    Config1 = rabbit_ct_helpers:merge_app_env(Config, {rabbit, [{ssl_options, Ssl2}]}),
     rabbit_ct_helpers:merge_app_env(Config1, ?BASE_CONF_MQTT).
 
 init_per_suite(Config) ->
@@ -123,11 +124,3 @@ run_test(Config, Target) ->
 
 rpc(Config, M, F, A) ->
     rabbit_ct_broker_helpers:rpc(Config, 0, M, F, A).
-
-q(P, [K | Rem]) ->
-    case proplists:get_value(K, P) of
-        undefined -> undefined;
-        V -> q(V, Rem)
-    end;
-q(P, []) -> {ok, P}.
-