Skip to content

Commit

Permalink
wip 3
Browse files Browse the repository at this point in the history
  • Loading branch information
lhoguin committed Sep 17, 2024
1 parent aee465f commit 5857bc0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions deps/rabbitmq_ct_helpers/src/rabbit_ct_config_schema.erl
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ test_snippet(Config, Snippet = {SnipID, _, _}, Expected, _Plugins, Sort) ->

write_snippet(Config, {Name, Conf, Advanced}) ->
ResultsDir = ?config(results_dir, Config),
file:make_dir(filename:join(ResultsDir, Name)),
_ = file:make_dir(filename:join(ResultsDir, Name)),
ConfFile = filename:join([ResultsDir, Name, "config.conf"]),
AdvancedFile = filename:join([ResultsDir, Name, "advanced.config"]),

file:write_file(ConfFile, Conf),
rabbit_file:write_term_file(AdvancedFile, [Advanced]),
ok = file:write_file(ConfFile, Conf),
ok = rabbit_file:write_term_file(AdvancedFile, [Advanced]),
{ConfFile, AdvancedFile}.

generate_config(ConfFile, AdvancedFile) ->
Expand Down
5 changes: 3 additions & 2 deletions deps/rabbitmq_ct_helpers/src/rabbit_ct_vm_helpers.erl
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ destroy_terraform_vms(Config) ->
] ++ TfVarFlags ++ [
TfConfigDir
],
rabbit_ct_helpers:exec(Cmd, [{env, Env}]),
{ok, _} = rabbit_ct_helpers:exec(Cmd, [{env, Env}]),
Config.

terraform_var_flags(Config) ->
Expand Down Expand Up @@ -1021,7 +1021,8 @@ do_setup_ct_logs_proxies(Nodes) ->
[begin
user_io_proxy(Node),
ct_logs_proxy(Node)
end || Node <- Nodes].
end || Node <- Nodes],
ok.

user_io_proxy(Node) ->
ok = setup_proxy(Node, user).
Expand Down

0 comments on commit 5857bc0

Please sign in to comment.