Просмотр исходного кода

Merge pull request #12865 from id/0411-cut-5.6.1-beta.1

chore: 5.6.1-beta.1
Ivan Dyachkov 1 год назад
Родитель
Сommit
76aa4cf434

+ 2 - 2
apps/emqx/include/emqx_release.hrl

@@ -32,7 +32,7 @@
 %% `apps/emqx/src/bpapi/README.md'
 
 %% Opensource edition
--define(EMQX_RELEASE_CE, "5.6.0").
+-define(EMQX_RELEASE_CE, "5.6.1-beta.1").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.6.0").
+-define(EMQX_RELEASE_EE, "5.6.1-beta.1").

+ 6 - 0
apps/emqx_machine/test/emqx_machine_SUITE.erl

@@ -144,7 +144,13 @@ t_open_ports_check(Config) ->
     ?assertEqual(ok, erpc:call(Core2, emqx_machine, open_ports_check, [])),
     ?assertEqual(ok, erpc:call(Replicant, emqx_machine, open_ports_check, [])),
 
+    true = erlang:monitor_node(Core2, true),
     ok = emqx_cth_cluster:stop_node(Core2),
+    receive
+        {nodedown, Core2} -> ok
+    after 10000 ->
+        ct:fail("nodedown message not received after 10 seconds.")
+    end,
 
     ?assertEqual(ok, erpc:call(Replicant, emqx_machine, open_ports_check, [])),
     Results = erpc:call(Core1, emqx_machine, open_ports_check, []),

+ 2 - 2
deploy/charts/emqx-enterprise/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.6.0
+version: 5.6.1-beta.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.6.0
+appVersion: 5.6.1-beta.1

+ 2 - 2
deploy/charts/emqx/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.6.0
+version: 5.6.1-beta.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.6.0
+appVersion: 5.6.1-beta.1