From 1098df815a91420a46c3155f94a49a1c79d5906e Mon Sep 17 00:00:00 2001
From: zhanghongtong <rory-z@outlook.com>
Date: Wed, 9 Jun 2021 18:17:15 +0800
Subject: [PATCH] chore(CI): fix relup error

---
 .ci/fvt_tests/.env                     |  1 -
 .ci/fvt_tests/http_server/rebar.config |  2 +-
 .ci/fvt_tests/relup.lux                | 31 +++++++++++++++++++-------
 .github/workflows/run_fvt_tests.yaml   |  9 ++++----
 scripts/apps-version-check.sh          |  3 +--
 5 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100644 .ci/fvt_tests/.env

diff --git a/.ci/fvt_tests/.env b/.ci/fvt_tests/.env
deleted file mode 100644
index 26b92be81..000000000
--- a/.ci/fvt_tests/.env
+++ /dev/null
@@ -1 +0,0 @@
-TARGET=emqx/emqx
diff --git a/.ci/fvt_tests/http_server/rebar.config b/.ci/fvt_tests/http_server/rebar.config
index 9cc5f3d02..29cc392ea 100644
--- a/.ci/fvt_tests/http_server/rebar.config
+++ b/.ci/fvt_tests/http_server/rebar.config
@@ -1,7 +1,7 @@
 {erl_opts, [debug_info]}.
 {deps, 
  [
-    {minirest, {git, "https://github.com/emqx/minirest.git", {tag, "0.3.1"}}}
+    {minirest, {git, "https://github.com/emqx/minirest.git", {tag, "0.3.5"}}}
  ]}.
 
 {shell, [
diff --git a/.ci/fvt_tests/relup.lux b/.ci/fvt_tests/relup.lux
index bd37d241d..33c35cb3e 100644
--- a/.ci/fvt_tests/relup.lux
+++ b/.ci/fvt_tests/relup.lux
@@ -28,6 +28,7 @@
     !cd emqx
     !sed -i 's|listener.wss.external[ \t]*=.*|listener.wss.external = 8085|g' etc/emqx.conf
     !sed -i '/emqx_telemetry/d' data/loaded_plugins
+
     !./bin/emqx start
     ?EMQ X .* is started successfully!
     ?SH-PROMPT
@@ -40,6 +41,7 @@
     !cd emqx2
 
     !sed -i '/emqx_telemetry/d' data/loaded_plugins
+
     !./bin/emqx start
     ?EMQ X (.*) is started successfully!
     ?SH-PROMPT
@@ -72,15 +74,22 @@
 
 [shell bench]
     !cd $BENCH_PATH
+
     !./emqtt_bench pub -c 10 -I 1000 -t t/%i -s 64 -L 300
     ???sent
 
 [shell emqx]
-    !cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/
-    !./bin/emqx install $VSN
+    !echo "" > log/emqx.log.1
     ?SH-PROMPT
-    !./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]"
-    ?$VSN
+
+    !cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/
+
+    !./bin/emqx install $VSN
+    ?Made release permanent: "$VSN"
+    ?SH-PROMPT
+
+    !./bin/emqx versions |grep permanent
+    ?(.*)$VSN
     ?SH-PROMPT
 
     !./bin/emqx_ctl cluster status
@@ -91,11 +100,17 @@
     ?SH-PROMPT
 
 [shell emqx2]
-    !cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/
-    !./bin/emqx install $VSN
+    !echo "" > log/emqx.log.1
     ?SH-PROMPT
-    !./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]"
-    ?$VSN
+
+    !cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/
+
+    !./bin/emqx install $VSN
+    ?Made release permanent: "$VSN"
+    ?SH-PROMPT
+
+    !./bin/emqx versions |grep permanent
+    ?(.*)$VSN
     ?SH-PROMPT
 
     !./bin/emqx_ctl cluster status
diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml
index 0bf57dc39..de7b475a6 100644
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@@ -191,7 +191,7 @@ jobs:
         - uses: actions/checkout@v2
           with:
             repository: hawk/lux
-            ref: lux-2.4
+            ref: lux-2.6
             path: lux
         - uses: actions/checkout@v2
           with:
@@ -253,14 +253,15 @@ jobs:
             make
             make install
         - name: run relup test
+          timeout-minutes: 20
           run: |
             set -e -x -u
             if [ -n "$OLD_VSNS" ]; then
                 mkdir -p packages
                 cp emqx/_packages/${PROFILE}/*.zip packages
                 cp emqx/_upgrade_base/*.zip packages
-                lux -v \
-                --timeout 600000 \
+                lux \
+                --case_timeout infinity \
                 --var PROFILE=$PROFILE \
                 --var PACKAGE_PATH=$(pwd)/packages \
                 --var BENCH_PATH=$(pwd)/emqtt-bench \
@@ -275,5 +276,3 @@ jobs:
             name: lux_logs
             path: lux_logs
 
-
-
diff --git a/scripts/apps-version-check.sh b/scripts/apps-version-check.sh
index 8de85cd8c..580fd5ef2 100755
--- a/scripts/apps-version-check.sh
+++ b/scripts/apps-version-check.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-remote="refs/remote/$(git remote -v | grep fetch | grep 'emqx/emqx' | awk '{print $1}')"
-latest_release=$(git describe --tags "$(git rev-list --tags --max-count=1 --remotes="$remote")")
+latest_release=$(git describe --abbrev=0 --tags)
 
 bad_app_count=0