From 3ee4d699889e07583823bfcb2fdfb587b17abd24 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Sun, 2 Jan 2022 20:47:08 +0100 Subject: [PATCH] ci: fix rpm install package name prior to this fix, package name 'emqx' was hard coded this commit fixes it to use EMQX_NAME variable because it can be 'emqx-edge' or 'emqx-enterprise' --- .ci/build_packages/tests.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.ci/build_packages/tests.sh b/.ci/build_packages/tests.sh index 11ef9d8bf..5fead0139 100755 --- a/.ci/build_packages/tests.sh +++ b/.ci/build_packages/tests.sh @@ -131,13 +131,8 @@ emqx_test(){ fi ;; "rpm") - if [[ "${ARCH}" == "amd64" && $(rpm -E '%{rhel}') == 7 ]] ; - then - # EMQX OTP requires openssl11 to have TLS1.3 support - yum install -y openssl11; - fi - rpm -ivh "${PACKAGE_PATH}/${packagename}" - if ! rpm -q emqx | grep -q emqx; then + yum install -y "${PACKAGE_PATH}/${packagename}" + if ! rpm -q "${EMQX_NAME}" | grep -q "${EMQX_NAME}"; then echo "package install error" exit 1 fi