hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!539 om分仓后门禁脚本需要适配

Browse Source 
Merge pull request !539 from hangjin2020/master
This commit is contained in:
opengauss-bot
2020-12-24 16:29:49 +08:00
committed by Gitee
parent cf44423205 14f3ae4153
commit 70c0f6bbcd
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/regress/script/OM/auto_upgradectl.sh
View File

@ -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

9
src/test/regress/script/OM/automated-test.sh
View File

@ -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} ]