From 28508e23ecfb17a29027bd4dd76700657688a787 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 11 Feb 2022 13:07:44 +0100 Subject: [PATCH 1/3] ci: dump logs when failed to stop --- .ci/build_packages/tests.sh | 7 ++++++- .github/workflows/build_packages.yaml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index 3b97c01b8..4b02d92ae 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -153,7 +153,12 @@ relup_test(){ ./emqx/bin/emqx install "${TARGET_VERSION}" [ "$(./emqx/bin/emqx versions |grep permanent | awk '{print $2}')" = "${TARGET_VERSION}" ] || exit 1 ./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/.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 From a42403e0460c0e6666b28a9c4d465c053e29210b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 11 Feb 2022 15:56:25 +0100 Subject: [PATCH 2/3] ci: quite unzip --- .ci/build_packages/tests.sh | 2 +- .ci/docker-compose-file/http-service/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index 4b02d92ae..b12957540 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -145,7 +145,7 @@ 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 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 From 2df43f8b5fa34db1b95de1c6c472490c74d6edeb Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 11 Feb 2022 16:19:02 +0100 Subject: [PATCH 3/3] ci: add more time to allow stop --- .ci/build_packages/tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index b12957540..01fdc07dc 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -152,6 +152,7 @@ relup_test(){ 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 if ! ./emqx/bin/emqx stop; then cat emqx/log/erlang.log.1 || true