diff --git a/src/test/regress/script/OM/auto_upgradectl.sh b/src/test/regress/script/OM/auto_upgradectl.sh index b959f0516..3bcc13b1c 100644 --- a/src/test/regress/script/OM/auto_upgradectl.sh +++ b/src/test/regress/script/OM/auto_upgradectl.sh @@ -21,7 +21,9 @@ password=`cat ${xmlpath} |grep -w "password"|awk -F'"' '{print $4}'` usergroup="dbgrp" envfilepath="${workdir}/om/env1" logfilesavepath=/home/OM/log -upgradefilepath=${workdir}/openGauss/package/${upgradepackage} +upgradefilepath_om=${workdir}/openGauss/package/openGauss-1.0.1-CentOS-64bit-om.tar.gz +upgradefilepath_app=${workdir}/openGauss/package/openGauss-1.0.1-CentOS-64bit.tar.bz2 +upgradefilepath_app_sha256=${workdir}/openGauss/package/openGauss-1.0.1-CentOS-64bit.sha256 package_path=/home/openGauss-1.0.1-CentOS-b109-64bit.tar.gz shellfilepath=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) # 用户校验 @@ -233,7 +235,9 @@ startwithhostname() #升级 upgradectl() { - chmod 777 ${upgradefilepath} + chmod 777 ${upgradefilepath_om} + chmod 777 ${upgradefilepath_app} + chmod 777 ${upgradefilepath_app_sha256} echo "准备停止集群" logdir=`logCheck stopdb.log` echo -e "\033[32m 正在执行stop操作:gs_om -t stop \033[0m" @@ -248,7 +252,9 @@ upgradectl() echo "gs_om -t 停止集群操作执行成功,准备进行升级包解压" if [ ! -e ${workdir}/package/upgrade/ ] then - tar -zxvf ${upgradefilepath} -C ${workdir}/om/package/ + tar -zxvf ${upgradefilepath_om} -C ${workdir}/om/package/ + cp -rf ${upgradefilepath_app} ${workdir}/om/package/ + cp -rf ${upgradefilepath_app_sha256} ${workdir}/om/package/ fi if [ $? == 0 ] then diff --git a/src/test/regress/script/OM/automated-test.sh b/src/test/regress/script/OM/automated-test.sh index a063ad552..89dad18b8 100644 --- a/src/test/regress/script/OM/automated-test.sh +++ b/src/test/regress/script/OM/automated-test.sh @@ -21,7 +21,9 @@ password=`cat ${xmlpath} |grep -w "password"|awk -F'"' '{print $4}'` usergroup="dbgrp" envfilepath="${workspace}/om/env" logfilesavepath=/usr1/opengaussautoinstall/log -package_path=${workspace}/openGauss/package/openGauss-1.0.1-CentOS-64bit.tar.gz +package_path_om=${workspace}/openGauss/package/openGauss-1.0.1-CentOS-64bit-om.tar.gz +package_path_app=${workspace}/openGauss/package/openGauss-1.0.1-CentOS-64bit.tar.bz2 +package_path_app_sha256=${workspace}/openGauss/package/openGauss-1.0.1-CentOS-64bit.sha256 shellfilepath=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) hostname=`hostname` ip=`hostname -i|awk '{print $1}'` @@ -57,8 +59,9 @@ else fi chmod -R 777 ${workspace}/om/package -tar -zvxf ${package_path} -C ${workspace}/om/package/ - +tar -zvxf ${package_path_om} -C ${workspace}/om/package/ +cp ${package_path_app} ${workspace}/om/package/ +cp ${package_path_app_sha256} ${workspace}/om/package/ chmod -R 777 ${workspace}/om if [ ! -e ${scriptpath} ]