diff --git a/.ci/fvt_tests/relup.lux b/.ci/fvt_tests/relup.lux index e631a7d0b..83937291a 100644 --- a/.ci/fvt_tests/relup.lux +++ b/.ci/fvt_tests/relup.lux @@ -1,7 +1,9 @@ [config var=PROFILE] [config var=PACKAGE_PATH] [config var=VSN] +[config var=CUR_PKG] [config var=OLD_VSN] +[config var=OLD_PKG] [config shell_cmd=/bin/bash] [config timeout=600000] @@ -19,7 +21,7 @@ [shell emqx1] !cd $PACKAGE_PATH !mkdir -p emqx1 - !tar -C emqx1 -zxf ${PROFILE}-$(echo $OLD_VSN | sed -r 's/[v|e]//g')-*-ubuntu20.04-amd64.tar.gz + !tar -C emqx1 -zxf "$OLD_PKG" ?SH-PROMPT !cd emqx1 @@ -33,7 +35,7 @@ [shell emqx2] !cd $PACKAGE_PATH !mkdir -p emqx2 - !tar -C emqx2 -zxf ${PROFILE}-$(echo $OLD_VSN | sed -r 's/[v|e]//g')-*-ubuntu20.04-amd64.tar.gz + !tar -C emqx2 -zxf "$OLD_PKG" ?SH-PROMPT !cd emqx2 @@ -84,7 +86,7 @@ !echo "" > log/emqx.log.1 ?SH-PROMPT - !cp -f ../$PROFILE-$VSN-*-ubuntu20.04-amd64.tar.gz releases/ + !cp -f ../$CUR_PKG releases/ ## 1. upgrade to the new version !./bin/emqx install $VSN @@ -123,7 +125,7 @@ !echo "" > log/emqx.log.1 ?SH-PROMPT - !cp -f ../$PROFILE-$VSN-*-ubuntu20.04-amd64.tar.gz releases/ + !cp -f ../$CUR_PKG releases/ ## 1. upgrade to the new version !./bin/emqx install $VSN diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 8516b005b..061ca3d20 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -114,7 +114,8 @@ jobs: profile='emqx' ;; esac - + old_pkg="${profile}-${OLD_VSN#[e|v]}-otp24.2.1-1-ubuntu20.04-amd64.tar.gz" + cur_pkg="${profile}-${cur_vsn}-otp24.2.1-1-ubuntu20.04-amd64.tar.gz" lux \ --progress verbose \ --case_timeout infinity \ @@ -122,6 +123,8 @@ jobs: --var PACKAGE_PATH=$(pwd)/packages \ --var VSN="$cur_vsn" \ --var OLD_VSN="$OLD_VSN" \ + --var CUR_PKG="$cur_pkg" \ + --var OLD_PKG="$old_pkg" \ emqx_built/.ci/fvt_tests/relup.lux - uses: actions/upload-artifact@v2 name: Save debug data @@ -129,7 +132,6 @@ jobs: with: name: debug_data path: | - packages/emqx1/log/* - packages/emqx2/log/* - packages/*.tar.gz + packages/emqx1/* + packages/emqx2/* lux_logs