From 636247650854c41645d238f0964f70eccaa64328 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 3 Feb 2023 09:00:34 +0100
Subject: [PATCH 1/3] feat: disable telemetry for ee by default

---
 lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf |  1 +
 scripts/merge-config.escript                 | 33 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf

diff --git a/lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf b/lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf
new file mode 100644
index 000000000..8da63dad9
--- /dev/null
+++ b/lib-ee/emqx_ee_conf/etc/emqx-enterprise.conf
@@ -0,0 +1 @@
+telemetry.enable = false
diff --git a/scripts/merge-config.escript b/scripts/merge-config.escript
index 1b30dbd1d..d30a0ca68 100755
--- a/scripts/merge-config.escript
+++ b/scripts/merge-config.escript
@@ -30,7 +30,7 @@ main(_) ->
     case IsEnterprise of
         true ->
             EnterpriseCfgs = get_all_cfgs("lib-ee"),
-            EnterpriseConf = merge("", EnterpriseCfgs),
+            EnterpriseConf = merge(<<"">>, EnterpriseCfgs),
             ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf);
         false ->
             ok
@@ -41,22 +41,21 @@ is_enterprise() ->
     nomatch =/= string:find(Profile, "enterprise").
 
 merge(BaseConf, Cfgs) ->
-    lists:foldl(
-        fun(CfgFile, Acc) ->
-            case filelib:is_regular(CfgFile) of
-                true ->
-                    {ok, Bin1} = file:read_file(CfgFile),
-                    case string:trim(Bin1, both) of
-                        <<>> -> Acc;
-                        Bin2 -> [Acc, io_lib:nl(), io_lib:nl(), Bin2]
-                    end;
-                false ->
-                    Acc
-            end
-        end,
-        BaseConf,
-        Cfgs
-    ).
+    Confs = [BaseConf | lists:map(fun read_conf/1, Cfgs)],
+    infix(lists:filter(fun(I) -> iolist_size(I) > 0 end, Confs), [io_lib:nl(), io_lib:nl()]).
+
+read_conf(CfgFile) ->
+    case filelib:is_regular(CfgFile) of
+        true ->
+            {ok, Bin1} = file:read_file(CfgFile),
+            string:trim(Bin1, both);
+        false ->
+            <<>>
+    end.
+
+infix([], _With) -> [];
+infix([One], _With) -> [One];
+infix([H | T], With) -> [H, With, infix(T, With)].
 
 get_all_cfgs(Root) ->
     Apps0 = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],

From c95d201331ca59a4ff361a3b53dfb194da821616 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 3 Feb 2023 09:40:28 +0100
Subject: [PATCH 2/3] ci: no relup for now

---
 scripts/relup-build/download-base-packages.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/relup-build/download-base-packages.sh b/scripts/relup-build/download-base-packages.sh
index 1a03f7ef8..8d89e8ab5 100755
--- a/scripts/relup-build/download-base-packages.sh
+++ b/scripts/relup-build/download-base-packages.sh
@@ -14,8 +14,10 @@ export PROFILE
 
 case $PROFILE in
     "emqx-enterprise")
-        DIR='emqx-ee'
-        EDITION='enterprise'
+        #DIR='emqx-ee'
+        #EDITION='enterprise'
+        echo "No relup for now"
+        exit 0
         ;;
     "emqx")
         echo "No relup for opensource edition"

From 7233f42889d3786575742e8a404b54edded04632 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 3 Feb 2023 09:58:02 +0100
Subject: [PATCH 3/3] ci: skip relup tests for now

---
 .github/workflows/run_relup_tests.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml
index a6854aa40..29b4fbc45 100644
--- a/.github/workflows/run_relup_tests.yaml
+++ b/.github/workflows/run_relup_tests.yaml
@@ -4,13 +4,13 @@ concurrency:
   group: relup-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
-on:
-  push:
-    branches:
-      - '**'
-    tags:
-      - e*
-  pull_request:
+# on:
+#   push:
+#     branches:
+#       - '**'
+#     tags:
+#       - e*
+#   pull_request:
 
 jobs:
   relup_test_plan: