From 23569198cf87a63bff46845992d06e2ddc4dabb0 Mon Sep 17 00:00:00 2001 From: William Yang Date: Mon, 31 Oct 2022 14:55:20 +0100 Subject: [PATCH] ci(relup-test): merge two jobs --- .github/workflows/run_fvt_tests.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 2add87ac0..2750be7f4 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -313,18 +313,14 @@ jobs: repository: terry-xiaoyu/one_more_emqx ref: master path: one_more_emqx - - name: Prepare packages + - name: Run relup test scenario + timeout-minutes: 6 run: | set -e -x -u - mkdir -p packages - cp emqx_built/_packages/*/*.zip packages old_emqx_vsn=${OLD_VSN#[e|v]} old_otp_vsn=$(escript emqx_built/scripts/relup-base-vsns.escript otp-vsn-for "${old_emqx_vsn}" emqx_built/data/relup-paths.eterm) - cd packages - wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$BROKER/$OLD_VSN/$PROFILE-${old_emqx_vsn}-otp${old_otp_vsn}-ubuntu20.04-amd64.zip - - name: Run relup test scenario - timeout-minutes: 5 - run: | + wget --no-verbose -P packages https://s3-us-west-2.amazonaws.com/packages.emqx/$BROKER/$OLD_VSN/$PROFILE-${old_emqx_vsn}-otp${old_otp_vsn}-ubuntu20.04-amd64.zip + cp emqx_built/_packages/*/*.zip packages lux \ --progress verbose \ --case_timeout infinity \ @@ -333,7 +329,7 @@ jobs: --var ONE_MORE_EMQX_PATH=$(pwd)/one_more_emqx \ --var VSN="$VSN" \ --var OLD_VSN="$OLD_VSN" \ - --var FROM_OTP_VSN="24.3.4.2-1" \ + --var FROM_OTP_VSN="${old_otp_vsn}" \ --var TO_OTP_VSN="24.3.4.2-1" \ emqx_built/.ci/fvt_tests/relup.lux - uses: actions/upload-artifact@v2