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

chore(CI): relup test support any commit

This commit is contained in:
zhanghongtong 2021-05-13 13:51:17 +08:00 committed by JianBo He
parent 6ba1a525e0
commit 9c244679dc
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.ci/fvt_tests/relup.lux
View File

@ -21,20 +21,15 @@
[shell emqx] [shell emqx]
!cd $PACKAGE_PATH !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 ?SH-PROMPT
!cd emqx !cd emqx
!sed -i 's|listener.wss.external[ \t]*=.*|listener.wss.external = 8085|g' etc/emqx.conf !sed -i 's|listener.wss.external[ \t]*=.*|listener.wss.external = 8085|g' etc/emqx.conf
!sed -i '/emqx_telemetry/d' data/loaded_plugins !sed -i '/emqx_telemetry/d' data/loaded_plugins
!./bin/emqx start !./bin/emqx start
?EMQ X Broker $old_vsn is started successfully! ?EMQ X .* is started successfully!
?SH-PROMPT
!./bin/emqx_ctl status
"""?
Node 'emqx@127.0.0.1' is started
emqx $old_vsn is running
"""
[shell emqx2] [shell emqx2]
!cd $PACKAGE_PATH !cd $PACKAGE_PATH
@ -45,13 +40,7 @@
!sed -i '/emqx_telemetry/d' data/loaded_plugins !sed -i '/emqx_telemetry/d' data/loaded_plugins
!./bin/emqx start !./bin/emqx start
?EMQ X Broker $old_vsn is started successfully! ?EMQ X (.*) is started successfully!
!./bin/emqx_ctl status
"""?
Node 'emqx2@127.0.0.1' is started
emqx $old_vsn is running
"""
?SH-PROMPT ?SH-PROMPT
!./bin/emqx_ctl cluster join emqx@127.0.0.1 !./bin/emqx_ctl cluster join emqx@127.0.0.1
@ -86,7 +75,7 @@
???sent ???sent
[shell emqx] [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 !./bin/emqx install $VSN
?SH-PROMPT ?SH-PROMPT
!./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]" !./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]"
@ -101,7 +90,7 @@
?SH-PROMPT ?SH-PROMPT
[shell emqx2] [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 !./bin/emqx install $VSN
?SH-PROMPT ?SH-PROMPT
!./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]" !./bin/emqx versions |grep permanent | grep -oE "[0-9].[0-9].[0-9]"

8
.github/workflows/build_packages.yaml vendored
View File

@ -256,9 +256,9 @@ jobs:
if [ $PROFILE = "emqx" ];then broker="emqx-ce"; else broker="$PROFILE"; fi if [ $PROFILE = "emqx" ];then broker="emqx-ce"; else broker="$PROFILE"; fi
if [ $PROFILE = "emqx-ee" ];then edition='enterprise'; else edition='opensource'; 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]')" 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//")) old_vsns=($(git tag -l "e$pre_vsn.[0-9]" | sed "s/e$vsn//"))
else else
old_vsns=($(git tag -l "v$pre_vsn.[0-9]" | sed "s/v$vsn//")) old_vsns=($(git tag -l "v$pre_vsn.[0-9]" | sed "s/v$vsn//"))
@ -268,8 +268,8 @@ jobs:
cd _upgrade_base cd _upgrade_base
for tag in ${old_vsns[@]};do 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 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 --no-verbose https://s3-us-west-2.amazonaws.com/packages.emqx/$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.sha256
echo "$(cat $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256) $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip" | sha256sum -c || exit 1 echo "$(cat $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip.sha256) $PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip" | sha256sum -c || exit 1
fi fi
done done

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

@ -214,24 +214,26 @@ jobs:
broker="emqx-ee" broker="emqx-ee"
edition='enterprise' edition='enterprise'
fi 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 echo "VSN=$vsn" >> $GITHUB_ENV
pre_vsn="$(echo $vsn | grep -oE '^[0-9]+.[0-9]')" 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//")" old_vsns="$(git tag -l "v$pre_vsn.[0-9]" | xargs echo -n | sed "s/v$vsn//")"
else 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 fi
echo "OLD_VSNS=$old_vsns" >> $GITHUB_ENV echo "OLD_VSNS=$old_vsns" >> $GITHUB_ENV
- name: download emqx - name: download emqx
run: | run: |
set -e -x -u set -e -x -u
cd emqx mkdir -p emqx/_upgrade_base
cd emqx/_upgrade_base
old_vsns=($(echo $OLD_VSNS | tr ' ' ' ')) old_vsns=($(echo $OLD_VSNS | tr ' ' ' '))
for old_vsn in ${old_vsns[@]}; do 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 done
- name: build emqx - name: build emqx
run: make -C emqx ${PROFILE}-zip run: make -C emqx ${PROFILE}-zip
@ -251,7 +253,7 @@ jobs:
if [ -n "$OLD_VSNS" ]; then if [ -n "$OLD_VSNS" ]; then
mkdir -p packages mkdir -p packages
cp emqx/_packages/emqx/*.zip packages cp emqx/_packages/emqx/*.zip packages
cp emqx/*.zip packages cp emqx/_upgrade_base/*.zip packages
lux -v \ lux -v \
--timeout 600000 \ --timeout 600000 \
--var PACKAGE_PATH=$(pwd)/packages \ --var PACKAGE_PATH=$(pwd)/packages \