From 9c244679dcbc316ba8931fa2b197e7bd3af507d8 Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Thu, 13 May 2021 13:51:17 +0800 Subject: [PATCH] chore(CI): relup test support any commit --- .ci/fvt_tests/relup.lux | 23 ++++++----------------- .github/workflows/build_packages.yaml | 8 ++++---- .github/workflows/run_fvt_tests.yaml | 14 ++++++++------ 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.ci/fvt_tests/relup.lux b/.ci/fvt_tests/relup.lux index c0c2b7592..b75e0fa94 100644 --- a/.ci/fvt_tests/relup.lux +++ b/.ci/fvt_tests/relup.lux @@ -21,20 +21,15 @@ [shell emqx] !cd $PACKAGE_PATH - !unzip -q -o emqx-ubuntu20.04-$old_vsn-x86_64.zip + !unzip -q -o emqx-ubuntu20.04-$(echo $old_vsn | sed -r 's/[v|e]//g')-amd64.zip ?SH-PROMPT !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 Broker $old_vsn is started successfully! - - !./bin/emqx_ctl status - """? - Node 'emqx@127.0.0.1' is started - emqx $old_vsn is running - """ + ?EMQ X .* is started successfully! + ?SH-PROMPT [shell emqx2] !cd $PACKAGE_PATH @@ -45,13 +40,7 @@ !sed -i '/emqx_telemetry/d' data/loaded_plugins !./bin/emqx start - ?EMQ X Broker $old_vsn is started successfully! - - !./bin/emqx_ctl status - """? - Node 'emqx2@127.0.0.1' is started - emqx $old_vsn is running - """ + ?EMQ X (.*) is started successfully! ?SH-PROMPT !./bin/emqx_ctl cluster join emqx@127.0.0.1 @@ -86,7 +75,7 @@ ???sent [shell emqx] - !cp -f ../emqx-ubuntu20.04-$VSN-x86_64.zip releases/ + !cp -f ../emqx-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]" @@ -101,7 +90,7 @@ ?SH-PROMPT [shell emqx2] - !cp -f ../emqx-ubuntu20.04-$VSN-x86_64.zip releases/ + !cp -f ../emqx-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]" diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index fde6795b1..70419bcc1 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -256,9 +256,9 @@ jobs: if [ $PROFILE = "emqx" ];then broker="emqx-ce"; else broker="$PROFILE"; fi if [ $PROFILE = "emqx-ee" ];then edition='enterprise'; else edition='opensource'; fi - vsn="$(grep -E "define.+EMQX_RELEASE.+${edition}" include/emqx_release.hrl | cut -d '"' -f2)" + vsn="$(./pkg-vsn.sh)" pre_vsn="$(echo $vsn | grep -oE '^[0-9]+.[0-9]')" - if [ $PROFILE = "emqx-ee" ]; then + if [ $PROFILE = "emqx-ee" ]; then old_vsns=($(git tag -l "e$pre_vsn.[0-9]" | sed "s/e$vsn//")) else old_vsns=($(git tag -l "v$pre_vsn.[0-9]" | sed "s/v$vsn//")) @@ -268,8 +268,8 @@ jobs: cd _upgrade_base for tag in ${old_vsns[@]};do if [ ! -z "$(echo $(curl -I -m 10 -o /dev/null -s -w %{http_code} https://s3-${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com/${{ secrets.AWS_S3_BUCKET }}/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip) | grep -oE "^[23]+")" ];then - wget https://s3-${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com/${{ secrets.AWS_S3_BUCKET }}/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip - wget https://s3-${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com/${{ secrets.AWS_S3_BUCKET }}/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256 + wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip + wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$broker/$tag/$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256 echo "$(cat $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256) $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip" | sha256sum -c || exit 1 fi done diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 8f65d022e..eea7acde5 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -214,24 +214,26 @@ jobs: broker="emqx-ee" edition='enterprise' fi + echo "BROKER=$broker" >> $GITHUB_ENV - vsn="$(grep -E "define.+EMQX_RELEASE.+${edition}" include/emqx_release.hrl | cut -d '"' -f2)" + vsn="$(./pkg-vsn.sh)" echo "VSN=$vsn" >> $GITHUB_ENV pre_vsn="$(echo $vsn | grep -oE '^[0-9]+.[0-9]')" - if [ $PROFILE = "emqx" ]; then + if [ $PROFILE = "emqx" ]; then old_vsns="$(git tag -l "v$pre_vsn.[0-9]" | xargs echo -n | sed "s/v$vsn//")" else - old_vsns="$(git tag -l "e$pre_vsn.[0-9]" | xargs echo -n | sed "s/v$vsn//")" + old_vsns="$(git tag -l "e$pre_vsn.[0-9]" | xargs echo -n | sed "s/e$vsn//")" fi echo "OLD_VSNS=$old_vsns" >> $GITHUB_ENV - name: download emqx run: | set -e -x -u - cd emqx + mkdir -p emqx/_upgrade_base + cd emqx/_upgrade_base old_vsns=($(echo $OLD_VSNS | tr ' ' ' ')) for old_vsn in ${old_vsns[@]}; do - wget https://s3-${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com/${{ secrets.AWS_S3_BUCKET }}/$broker/$old_vsn/$PROFILE-ubuntu20.04-${old_vsn#[e|v]}-x86_64.zip + wget --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$BROKER/$old_vsn/$PROFILE-ubuntu20.04-${old_vsn#[e|v]}-amd64.zip done - name: build emqx run: make -C emqx ${PROFILE}-zip @@ -251,7 +253,7 @@ jobs: if [ -n "$OLD_VSNS" ]; then mkdir -p packages cp emqx/_packages/emqx/*.zip packages - cp emqx/*.zip packages + cp emqx/_upgrade_base/*.zip packages lux -v \ --timeout 600000 \ --var PACKAGE_PATH=$(pwd)/packages \