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

ci: no need to set python2 for yum for el8

This commit is contained in:
Zaiming (Stone) Shi 2022-12-14 22:50:07 +01:00
parent 82db73c3f7
commit f704c4c96b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/pkg-tests.sh
View File

@ -47,10 +47,11 @@ export EMQX_NAME
export PACKAGE_PATH="${CODE_PATH}/_packages/${EMQX_NAME}" export PACKAGE_PATH="${CODE_PATH}/_packages/${EMQX_NAME}"
export RELUP_PACKAGE_PATH="${CODE_PATH}/_upgrade_base" export RELUP_PACKAGE_PATH="${CODE_PATH}/_upgrade_base"
SYSTEM="$("$SCRIPTS"/get-distro.sh)"
if [ "$PACKAGE_TYPE" = 'tgz' ]; then if [ "$PACKAGE_TYPE" = 'tgz' ]; then
PKG_SUFFIX="tar.gz" PKG_SUFFIX="tar.gz"
else else
SYSTEM="$("$SCRIPTS"/get-distro.sh)"
case "${SYSTEM:-}" in case "${SYSTEM:-}" in
ubuntu*|debian*|raspbian*) ubuntu*|debian*|raspbian*)
PKG_SUFFIX='deb' PKG_SUFFIX='deb'
@ -149,7 +150,15 @@ emqx_test(){
;; ;;
"rpm") "rpm")
# yum wants python2 # yum wants python2
alternatives --list | grep python && alternatives --set python /usr/bin/python2 case "${SYSTEM:-}" in
"el8")
# el8 is fine with python3
true
;;
*)
alternatives --list | grep python && alternatives --set python /usr/bin/python2
;;
esac
YUM_RES=$(yum install -y "${PACKAGE_PATH}/${packagename}"| tee /dev/null) YUM_RES=$(yum install -y "${PACKAGE_PATH}/${packagename}"| tee /dev/null)
if [[ $YUM_RES =~ "Failed" ]]; then if [[ $YUM_RES =~ "Failed" ]]; then
echo "yum install failed" echo "yum install failed"