Просмотр исходного кода

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'
Zaiming (Stone) Shi 4 лет назад
Родитель
Сommit
3ee4d69988
1 измененных файлов с 2 добавлено и 7 удалено
  1. 2 7
      .ci/build_packages/tests.sh

+ 2 - 7
.ci/build_packages/tests.sh

@@ -131,13 +131,8 @@ emqx_test(){
                 fi
                 fi
             ;;
             ;;
             "rpm")
             "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"
                     echo "package install error"
                     exit 1
                     exit 1
                 fi
                 fi