diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index 3b97c01b8..01fdc07dc 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -145,15 +145,21 @@ relup_test(){ find . -maxdepth 1 -name "${EMQX_NAME}-*-${ARCH}.zip" | while read -r pkg; do packagename=$(basename "${pkg}") - unzip "$packagename" + unzip -q "$packagename" ./emqx/bin/emqx start || ( tail emqx/log/emqx.log.1 && exit 1 ) ./emqx/bin/emqx_ctl status ./emqx/bin/emqx versions cp "${PACKAGE_PATH}/${EMQX_NAME}"-*-"${TARGET_VERSION}-${ARCH}".zip ./emqx/releases ./emqx/bin/emqx install "${TARGET_VERSION}" [ "$(./emqx/bin/emqx versions |grep permanent | awk '{print $2}')" = "${TARGET_VERSION}" ] || exit 1 + export EMQX_WAIT_FOR_STOP=300 ./emqx/bin/emqx_ctl status - ./emqx/bin/emqx stop + if ! ./emqx/bin/emqx stop; then + cat emqx/log/erlang.log.1 || true + cat emqx/log/emqx.log.1 || true + echo "failed to stop emqx" + exit 1 + fi rm -rf emqx done fi diff --git a/.ci/docker-compose-file/http-service/Dockerfile b/.ci/docker-compose-file/http-service/Dockerfile index df1f7f98c..6601841ef 100644 --- a/.ci/docker-compose-file/http-service/Dockerfile +++ b/.ci/docker-compose-file/http-service/Dockerfile @@ -1,7 +1,7 @@ FROM tomcat:10.0.5 RUN wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip \ - && unzip apache-maven-3.6.3-bin.zip \ + && unzip -q apache-maven-3.6.3-bin.zip \ && mv apache-maven-3.6.3 /opt/apache-maven-3.6.3/ \ && ln -s /opt/apache-maven-3.6.3/ /opt/maven ENV M2_HOME=/opt/maven diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 1a5603126..41376cc19 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -195,7 +195,12 @@ jobs: exit 1 fi ./emqx/bin/emqx_ctl status - ./emqx/bin/emqx stop + if ! ./emqx/bin/emqx stop; then + cat emqx/log/erlang.log.1 || true + cat emqx/log/emqx.log.1 || true + echo "failed to stop emqx" + exit 1 + fi rm -rf emqx openssl dgst -sha256 ./_packages/${{ matrix.profile }}/$pkg_name | awk '{print $2}' > ./_packages/${{ matrix.profile }}/$pkg_name.sha256 - uses: actions/upload-artifact@v1