Merge pull request #10549 from thalesmg/tests-is-ci-var-v50
ci: set `IS_CI=yes` when running tests
This commit is contained in:
commit
0bd4beae6e
|
@ -14,6 +14,9 @@ on:
|
||||||
- e*
|
- e*
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
|
env:
|
||||||
|
IS_CI: "yes"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-matrix:
|
build-matrix:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
|
@ -271,6 +271,7 @@ app_schema(App) ->
|
||||||
mustache_vars(App, Opts) ->
|
mustache_vars(App, Opts) ->
|
||||||
ExtraMustacheVars = maps:get(extra_mustache_vars, Opts, #{}),
|
ExtraMustacheVars = maps:get(extra_mustache_vars, Opts, #{}),
|
||||||
Defaults = #{
|
Defaults = #{
|
||||||
|
node_cookie => atom_to_list(erlang:get_cookie()),
|
||||||
platform_data_dir => app_path(App, "data"),
|
platform_data_dir => app_path(App, "data"),
|
||||||
platform_etc_dir => app_path(App, "etc"),
|
platform_etc_dir => app_path(App, "etc"),
|
||||||
platform_log_dir => app_path(App, "log")
|
platform_log_dir => app_path(App, "log")
|
||||||
|
@ -667,6 +668,7 @@ start_slave(Name, Opts) when is_map(Opts) ->
|
||||||
SlaveMod = maps:get(peer_mod, Opts, ct_slave),
|
SlaveMod = maps:get(peer_mod, Opts, ct_slave),
|
||||||
Node = node_name(Name),
|
Node = node_name(Name),
|
||||||
put_peer_mod(Node, SlaveMod),
|
put_peer_mod(Node, SlaveMod),
|
||||||
|
Cookie = atom_to_list(erlang:get_cookie()),
|
||||||
DoStart =
|
DoStart =
|
||||||
fun() ->
|
fun() ->
|
||||||
case SlaveMod of
|
case SlaveMod of
|
||||||
|
@ -678,7 +680,11 @@ start_slave(Name, Opts) when is_map(Opts) ->
|
||||||
{monitor_master, true},
|
{monitor_master, true},
|
||||||
{init_timeout, 20_000},
|
{init_timeout, 20_000},
|
||||||
{startup_timeout, 20_000},
|
{startup_timeout, 20_000},
|
||||||
{erl_flags, erl_flags()}
|
{erl_flags, erl_flags()},
|
||||||
|
{env, [
|
||||||
|
{"HOCON_ENV_OVERRIDE_PREFIX", "EMQX_"},
|
||||||
|
{"EMQX_NODE__COOKIE", Cookie}
|
||||||
|
]}
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
slave ->
|
slave ->
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
%% -*- mode: erlang -*-
|
%% -*- mode: erlang -*-
|
||||||
{application, emqx_resource, [
|
{application, emqx_resource, [
|
||||||
{description, "Manager for all external resources"},
|
{description, "Manager for all external resources"},
|
||||||
{vsn, "0.1.14"},
|
{vsn, "0.1.15"},
|
||||||
{registered, []},
|
{registered, []},
|
||||||
{mod, {emqx_resource_app, []}},
|
{mod, {emqx_resource_app, []}},
|
||||||
{applications, [
|
{applications, [
|
||||||
|
|
Loading…
Reference in New Issue