spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-10-09 11:52:21 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

检验是否安装转到worker

Browse Source
This commit is contained in:
shenmo 2023-03-09 17:54:31 +08:00
parent e865431411
commit 22cb1f6058
4 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,5 +1,6 @@
spark-store (4.2.3.2~Reason9) stable; urgency=medium spark-store (4.2.3.2~Reason9) stable; urgency=medium
* sender-d.sh * sender-d.sh
* ssinstall和ssaudit的安装测试转到upgrade-worker
-- shenmo <shenmo@spark-app.store> -- shenmo <shenmo@spark-app.store>

26
tool/ssaudit
View File

@ -27,30 +27,10 @@ fi
DEBPATH=`realpath $1` DEBPATH=`realpath $1`
echo ------------------------------------------------------------ echo ------------------------------------------------------------
try_run_output=$(aptss --dry-run install $DEBPATH) try_run_output=$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh test-install-app $2)
try_run_ret="$?" try_run_ret="$?"
if [ "$try_run_ret" -ne 0 ];then
if [ "$try_run_ret" -ne 0 ] exit $try_run_ret
then
echo "Package manager quit with exit code.Here is the log"
echo "包管理器以错误代码退出.日志如下"
echo
echo -e "${try_run_output}"
echo "Will try after run aptss update"
echo "将会在aptss update之后再次尝试"
aptss update
echo ----------------------------------------------------------------------------
try_run_output=$(aptss --dry-run install $DEBPATH)
try_run_ret="$?"
if [ "$try_run_ret" -ne 0 ]
then
echo "Package manager quit with exit code.Here is the log"
echo "包管理器以错误代码退出.日志如下"
echo
echo -e "${try_run_output}"
exit "$try_run_ret"
fi
fi fi

27
tool/ssinstall
View File

@ -92,33 +92,12 @@ if [ ! -z "$IS_MD5SUM_CHECKD" ];then
echo "校验成功，开始安装" echo "校验成功，开始安装"
echo ---------------------------------------------------------------------------------- echo ----------------------------------------------------------------------------------
try_run_output=$(aptss --dry-run install $DEBPATH) try_run_output=$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh test-install-app $2)
try_run_ret="$?" try_run_ret="$?"
if [ "$try_run_ret" -ne 0 ];then
if [ "$try_run_ret" -ne 0 ] exit $try_run_ret
then
echo "Package manager quit with exit code.Here is the log"
echo "包管理器以错误代码退出.日志如下"
echo
echo -e "${try_run_output}"
echo "Will try after run aptss update"
echo "将会在aptss update之后再次尝试"
aptss update
echo ----------------------------------------------------------------------------
try_run_output=$(aptss --dry-run install $DEBPATH)
try_run_ret="$?"
if [ "$try_run_ret" -ne 0 ]
then
echo "Package manager quit with exit code.Here is the log"
echo "包管理器以错误代码退出.日志如下"
echo
echo -e "${try_run_output}"
exit "$try_run_ret"
fi
fi fi
dpkg -i "$DEBPATH" || aptss install -yf dpkg -i "$DEBPATH" || aptss install -yf
#### --delete #### --delete

16
tool/update-upgrade/ss-do-upgrade-worker.sh
View File

@ -33,9 +33,22 @@ case $1 in
echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt
;; ;;
test-install-app) test-install-app)
try_run_output=$(aptss --dry-run install $2)
try_run_ret="$?"
if [ "$try_run_ret" -ne 0 ]
then
echo "Package manager quit with exit code.Here is the log"
echo "包管理器以错误代码退出.日志如下"
echo
echo -e "${try_run_output}"
echo "Will try after run aptss update"
echo "将会在aptss update之后再次尝试"
aptss update
echo ----------------------------------------------------------------------------
try_run_output=$(aptss --dry-run install $2) try_run_output=$(aptss --dry-run install $2)
try_run_ret="$?" try_run_ret="$?"
if [ "$try_run_ret" -ne 0 ] if [ "$try_run_ret" -ne 0 ]
then then
echo "Package manager quit with exit code.Here is the log" echo "Package manager quit with exit code.Here is the log"
@ -45,6 +58,7 @@ case $1 in
exit "$try_run_ret" exit "$try_run_ret"
fi fi
fi
exit 0 exit 0
;; ;;