From f8f7493352a6ccf2e2224a6d0c0779f926fa6596 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Sat, 17 Jul 2021 17:35:53 +0800
Subject: [PATCH] fix(test): set RETRY_INTERVAL and MAX_TOPIC_ALIAS for paho
 test

---
 .ci/docker-compose-file/conf.env     | 1 -
 .github/workflows/run_fvt_tests.yaml | 9 ++++-----
 bin/emqx.cmd                         | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.ci/docker-compose-file/conf.env b/.ci/docker-compose-file/conf.env
index 0b1b7c512..d80c79b12 100644
--- a/.ci/docker-compose-file/conf.env
+++ b/.ci/docker-compose-file/conf.env
@@ -10,5 +10,4 @@ EMQX_AUTH__PGSQL__PASSWORD=public
 EMQX_AUTH__PGSQL__DATABASE=mqtt
 EMQX_AUTH__REDIS__SERVER=redis_server:6379
 EMQX_AUTH__REDIS__PASSWORD=public
-CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_
 HOCON_ENV_OVERRIDE_PREFIX=EMQX_
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
index 280173bf7..c6b160304 100644
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@@ -36,10 +36,9 @@ jobs:
           timeout-minutes: 5
           run: |
             set -e -u -x
-            echo "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_" >> .ci/docker-compose-file/conf.cluster.env
             echo "HOCON_ENV_OVERRIDE_PREFIX=EMQX_" >> .ci/docker-compose-file/conf.cluster.env
-            echo "EMQX_ZONE__EXTERNAL__RETRY_INTERVAL=2s" >> .ci/docker-compose-file/conf.cluster.env
-            echo "EMQX_MQTT__MAX_TOPIC_ALIAS=10" >> .ci/docker-compose-file/conf.cluster.env
+            echo "EMQX_ZONES__DEFAULT__MQTT__RETRY_INTERVAL=2s" >> .ci/docker-compose-file/conf.cluster.env
+            echo "EMQX_ZONES__DEFAULT__MQTT__MAX_TOPIC_ALIAS=10" >> .ci/docker-compose-file/conf.cluster.env
             docker-compose \
                 -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
                 -f .ci/docker-compose-file/docker-compose-python.yaml \
@@ -118,8 +117,8 @@ jobs:
                 --set image.pullPolicy=Never \
                 --set emqxAclConfig="" \
                 --set image.pullPolicy=Never \
-                --set emqxConfig.EMQX_ZONE__EXTERNAL__RETRY_INTERVAL=2s \
-                --set emqxConfig.EMQX_MQTT__MAX_TOPIC_ALIAS=10 \
+                --set emqxConfig.EMQX_ZONES__DEFAULT__MQTT__RETRY_INTERVAL=2s \
+                --set emqxConfig.EMQX_ZONES__DEFAULT__MQTT__MAX_TOPIC_ALIAS=10 \
                 deploy/charts/emqx \
                 --debug
 
diff --git a/bin/emqx.cmd b/bin/emqx.cmd
index 8b9686462..768e30d2c 100644
--- a/bin/emqx.cmd
+++ b/bin/emqx.cmd
@@ -20,8 +20,6 @@
 @set erts_vsn={{ erts_vsn }}
 @set erl_opts={{ erl_opts }}
 
-@set "CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_"
-
 @set script=%~n0
 
 :: Discover the release root directory from the directory