ci: fix build scripts to accomodate for recent emqx_ds split

emqx · Jun 28, 2024 · d33b6ac · d33b6ac
1 parent cec60b0
commit d33b6ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,8 @@
 CT_NODE_NAME = ct@127.0.0.1
+CT_EMQX_PROFILE = emqx
 
 REBAR ?= $(or $(shell which rebar3 2>/dev/null),$(CURDIR)/rebar3)
+REBAR_TEST = env PROFILE=$(CT_EMQX_PROFILE) $(REBAR)
 
 REBAR_URL := https://github.com/erlang/rebar3/releases/download/3.19.0/rebar3
 
@@ -34,13 +36,13 @@ xref:
 	$(REBAR) xref
 
 eunit: compile
-	$(REBAR) eunit verbose=true
+	$(REBAR_TEST) eunit --verbose
 
 ct: compile
-	$(REBAR) as test ct -v --name $(CT_NODE_NAME)
+	$(REBAR_TEST) as test ct --verbose --name $(CT_NODE_NAME)
 
 cover:
-	$(REBAR) cover
+	$(REBAR_TEST) cover
 
 test: eunit ct cover
 

diff --git a/rebar.config b/rebar.config
@@ -25,10 +25,10 @@
             [ {meck, "0.9.2"}
             , {emqx, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx"}}
             , {emqx_utils, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx_utils"}}
-            , {emqx_durable_storage, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx_durable_storage"}}
             , {emqx_limiter, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx/src/emqx_limiter"}}
             , {emqx_durable_storage, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx_durable_storage"}}
-            , {emqx_utils, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx_utils"}}
+            , {emqx_ds_backends, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx_ds_backends"}}
+            , {emqx_ds_builtin_local, {git_subdir, "https://github.com/emqx/emqx", {branch, "master"}, "apps/emqx_ds_builtin_local"}}
             , {proper, "1.4.0"}
             ]},
          {erl_opts, [debug_info]},

diff --git a/test/emqtt_test_lib.erl b/test/emqtt_test_lib.erl
@@ -82,12 +82,11 @@ ensure_quic_listener(Name, BindPort) ->
 ensure_listener(Type, Name, BindAddr, BindPort) ->
     Type =:= quic andalso application:ensure_all_started(quicer),
     BaseConf = #{
-                 acceptors => 16,
-                 bind => {BindAddr, BindPort},
                  enable => true,
-                 idle_timeout => 15000,
-                 limiter => #{},
+                 bind => {BindAddr, BindPort},
+                 acceptors => 16,
                  max_connections => 1024000,
+                 limiter => #{},
                  mountpoint => <<>>,
                  zone => default,
                  proxy_protocol => false,
@@ -135,7 +134,8 @@ listener_conf(ws) ->
         mqtt_piggyback => multiple,
         proxy_address_header => "x-forwarded-for",
         proxy_port_header => "x-forwarded-port",
-        supported_subprotocols => ["mqtt","mqtt-v3","mqtt-v3.1.1","mqtt-v5"]}
+        supported_subprotocols => ["mqtt","mqtt-v3","mqtt-v3.1.1","mqtt-v5"],
+        validate_utf8 => true}
      };
 listener_conf(_) -> #{}.