From ad46208fa527c4a0dd17b40764edc6a19909364b Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Wed, 29 Sep 2021 12:56:09 +0200
Subject: [PATCH 1/2] chore(ci): dump debug log if failed to stop

---
 .ci/build_packages/tests.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh
index 53ab9ac57..60886e0aa 100755
--- a/.ci/build_packages/tests.sh
+++ b/.ci/build_packages/tests.sh
@@ -36,8 +36,10 @@ emqx_test(){
             "zip")
                 packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.zip)
                 unzip -q "${PACKAGE_PATH}/${packagename}"
-                export EMQX_ZONES__DEFAULT__MQTT__SERVER_KEEPALIVE=60 \
-                    EMQX_MQTT__MAX_TOPIC_ALIAS=10
+                export EMQX_ZONES__DEFAULT__MQTT__SERVER_KEEPALIVE=60
+                export EMQX_MQTT__MAX_TOPIC_ALIAS=10
+                export EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug
+                export EMQX_LOG__FILE_HANDLERS__DEFAULT__LEVEL=debug
                 [[ $(arch) == *arm* || $(arch) == aarch64 ]] && export EMQX_LISTENERS__QUIC__DEFAULT__ENABLED=false
                 # sed -i '/emqx_telemetry/d' "${PACKAGE_PATH}"/emqx/data/loaded_plugins
 
@@ -58,7 +60,11 @@ emqx_test(){
                     IDLE_TIME=$((IDLE_TIME+1))
                 done
                 pytest -v /paho-mqtt-testing/interoperability/test_client/V5/test_connect.py::test_basic
-                "${PACKAGE_PATH}"/emqx/bin/emqx stop
+                if ! "${PACKAGE_PATH}"/emqx/bin/emqx stop; then
+                    cat "${PACKAGE_PATH}"/emqx/log/erlang.log.1 || true
+                    cat "${PACKAGE_PATH}"/emqx/log/emqx.log.1 || true
+                    exit 1
+                fi
                 echo "running ${packagename} stop"
                 rm -rf "${PACKAGE_PATH}"/emqx
             ;;

From a591f00c5bcb90cb6cac12fb582de854712a175b Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Wed, 29 Sep 2021 14:21:30 +0200
Subject: [PATCH 2/2] chore(ci): increase wait time for emqx stop when running
 on arm

---
 .ci/build_packages/tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh
index 60886e0aa..da0ec7362 100755
--- a/.ci/build_packages/tests.sh
+++ b/.ci/build_packages/tests.sh
@@ -40,7 +40,10 @@ emqx_test(){
                 export EMQX_MQTT__MAX_TOPIC_ALIAS=10
                 export EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug
                 export EMQX_LOG__FILE_HANDLERS__DEFAULT__LEVEL=debug
-                [[ $(arch) == *arm* || $(arch) == aarch64 ]] && export EMQX_LISTENERS__QUIC__DEFAULT__ENABLED=false
+                if [[ $(arch) == *arm* || $(arch) == aarch64 ]]; then
+                    export EMQX_LISTENERS__QUIC__DEFAULT__ENABLED=false
+                    export WAIT_FOR_ERLANG_STOP=120
+                fi
                 # sed -i '/emqx_telemetry/d' "${PACKAGE_PATH}"/emqx/data/loaded_plugins
 
                 echo "running ${packagename} start"
@@ -139,6 +142,7 @@ EOF
         ## for ARM, due to CI env issue, skip start of quic listener for the moment
         [[ $(arch) == *arm* || $(arch) == aarch64 ]] && tee -a "$emqx_env_vars" <<EOF
 export EMQX_LISTENERS__QUIC__DEFAULT__ENABLED=false
+export WAIT_FOR_ERLANG_STOP=120
 EOF
     else
         echo "Error: cannot locate emqx_vars"