From b93ec0a83aed11cbd9af146455b91e4660814896 Mon Sep 17 00:00:00 2001
From: Rory Z <Rory-Z@outlook.com>
Date: Fri, 2 Jul 2021 15:03:05 +0800
Subject: [PATCH] chore(CI): fix github workflows error (#1)

---
 .github/workflows/build_slim_packages.yaml |  2 +-
 .github/workflows/run_fvt_tests.yaml       | 20 ++++++++++++++++++--
 deploy/docker/docker-entrypoint.sh         | 22 ----------------------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml
index 1f79b9ab2..30768e023 100644
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@@ -112,7 +112,7 @@ jobs:
         ./emqx/bin/emqx start || cat emqx/log/erlang.log.1
         ready='no'
         for i in {1..10}; do
-          if curl -fs 127.0.0.1:18083 > /dev/null; then
+          if curl -fs 127.0.0.1:8081/status > /dev/null; then
             ready='yes'
             break
           fi
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
index e414537b9..280173bf7 100644
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@@ -131,11 +131,27 @@ jobs:
               echo "waiting emqx started";
               sleep 10;
             done
-        - name: get pods log
+        - name: get emqx-0 pods log
           if: failure()
           env:
             KUBECONFIG: "/etc/rancher/k3s/k3s.yaml"
-          run: kubectl describe pods emqx-0
+          run: |
+            kubectl describe pods emqx-0
+            kubectl logs emqx-0
+        - name: get emqx-1 pods log
+          if: failure()
+          env:
+            KUBECONFIG: "/etc/rancher/k3s/k3s.yaml"
+          run: |
+            kubectl describe pods emqx-1
+            kubectl logs emqx-1
+        - name: get emqx-2 pods log
+          if: failure()
+          env:
+            KUBECONFIG: "/etc/rancher/k3s/k3s.yaml"
+          run: |
+            kubectl describe pods emqx-2
+            kubectl logs emqx-2
         - uses: actions/checkout@v2
           with:
             repository: emqx/paho.mqtt.testing
diff --git a/deploy/docker/docker-entrypoint.sh b/deploy/docker/docker-entrypoint.sh
index 16b6cb077..24498dc10 100755
--- a/deploy/docker/docker-entrypoint.sh
+++ b/deploy/docker/docker-entrypoint.sh
@@ -20,8 +20,6 @@ LOCAL_IP=$(hostname -i | grep -oE '((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])\.){3}(
 # Base settings in /opt/emqx/etc/emqx.conf
 # Plugin settings in /opt/emqx/etc/plugins
 
-_EMQX_HOME='/opt/emqx'
-
 if [[ -z "$EMQX_NAME" ]]; then
     EMQX_NAME="$(hostname)"
     export EMQX_NAME
@@ -109,26 +107,6 @@ fill_tuples() {
     done
 }
 
-## EMQX Plugin load settings
-# Plugins loaded by default
-LOADED_PLUGINS="$_EMQX_HOME/data/loaded_plugins"
-if [[ -n "$EMQX_LOADED_PLUGINS" ]]; then
-    EMQX_LOADED_PLUGINS=$(echo "$EMQX_LOADED_PLUGINS" | tr -d '[:cntrl:]' | sed -r -e 's/^[^A-Za-z0-9_]+//g' -e 's/[^A-Za-z0-9_]+$//g' -e 's/[^A-Za-z0-9_]+/ /g')
-    echo "EMQX_LOADED_PLUGINS=$EMQX_LOADED_PLUGINS"
-    # Parse module names and place `{module_name, true}.` tuples in `loaded_plugins`.
-    fill_tuples "$LOADED_PLUGINS" "$EMQX_LOADED_PLUGINS"
-fi
-
-## EMQX Modules load settings
-# Modules loaded by default
-LOADED_MODULES="$_EMQX_HOME/data/loaded_modules"
-if [[ -n "$EMQX_LOADED_MODULES" ]]; then
-    EMQX_LOADED_MODULES=$(echo "$EMQX_LOADED_MODULES" | tr -d '[:cntrl:]' | sed -r -e 's/^[^A-Za-z0-9_]+//g' -e 's/[^A-Za-z0-9_]+$//g' -e 's/[^A-Za-z0-9_]+/ /g')
-    echo "EMQX_LOADED_MODULES=$EMQX_LOADED_MODULES"
-    # Parse module names and place `{module_name, true}.` tuples in `loaded_modules`.
-    fill_tuples "$LOADED_MODULES" "$EMQX_LOADED_MODULES"
-fi
-
 # The default rpc port discovery 'stateless' is mostly for clusters
 # having static node names. So it's troulbe-free for multiple emqx nodes
 # running on the same host.