yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4854 from Rory-Z/chore/fix-relup-error-in-enterprise 

chore(CI): fix relup tests error in enterprise repo
This commit is contained in:
Zaiming (Stone) Shi 2021-05-24 15:15:11 +02:00 committed by GitHub
parent 3690529554 f2ccf97780
commit 1c0137c243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.ci/fvt_tests/relup.lux
View File

@ -1,3 +1,4 @@
[config var=PROFILE]
[config var=PACKAGE_PATH]
[config var=BENCH_PATH]
[config var=ONE_MORE_EMQX_PATH]
@ -21,7 +22,7 @@
[shell emqx]
!cd $PACKAGE_PATH
!unzip -q -o emqx-ubuntu20.04-$(echo $old_vsn | sed -r 's/[v|e]//g')-amd64.zip
!unzip -q -o $PROFILE-ubuntu20.04-$(echo $old_vsn | sed -r 's/[v|e]//g')-amd64.zip
?SH-PROMPT
!cd emqx
@ -33,8 +34,8 @@
[shell emqx2]
!cd $PACKAGE_PATH
!cp -f $ONE_MORE_EMQX_PATH/one_more_emqx.sh .
!./one_more_emqx.sh emqx2
!cp -f $ONE_MORE_EMQX_PATH/one_more_$(echo $PROFILE | sed 's/-/_/g').sh .
!./one_more_$(echo $PROFILE | sed 's/-/_/g').sh emqx2
?SH-PROMPT
!cd emqx2
@ -75,7 +76,7 @@
???sent
[shell emqx]
!cp -f ../emqx-ubuntu20.04-$VSN-amd64.zip releases/
!cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/
!./bin/emqx install $VSN
?SH-PROMPT
!./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]"
@ -90,7 +91,7 @@
?SH-PROMPT
[shell emqx2]
!cp -f ../emqx-ubuntu20.04-$VSN-amd64.zip releases/
!cp -f ../$PROFILE-ubuntu20.04-$VSN-amd64.zip releases/
!./bin/emqx install $VSN
?SH-PROMPT
!./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]"

1
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -264,6 +264,7 @@ jobs:
cp emqx/_upgrade_base/*.zip packages
lux -v \
--timeout 600000 \
--var PROFILE=$PROFILE \
--var PACKAGE_PATH=$(pwd)/packages \
--var BENCH_PATH=$(pwd)/emqtt-bench \
--var ONE_MORE_EMQX_PATH=$(pwd)/one_more_emqx \