From fec57862a0301a280b1b140bac70d332375e2ec0 Mon Sep 17 00:00:00 2001 From: hangjin2020 <850894759@qq.com> Date: Fri, 25 Dec 2020 17:19:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?version=E4=BB=8E1.0.1=E6=94=B9=E6=88=901.1.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/package.sh | 2 +- src/test/regress/script/OM/auto_upgradectl.sh | 6 +++--- src/test/regress/script/OM/automated-test.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/package.sh b/package/package.sh index 36e80c697..a74cdf4bc 100644 --- a/package/package.sh +++ b/package/package.sh @@ -87,7 +87,7 @@ fi ##default install version storage path declare server_version='openGauss' declare server_name_for_package="$(echo ${server_version} | sed 's/ /-/g')" # replace blank with '-' for package name. -declare version_number='1.0.1' +declare version_number='1.1.0' ####################################################################### ##putout the version of server diff --git a/src/test/regress/script/OM/auto_upgradectl.sh b/src/test/regress/script/OM/auto_upgradectl.sh index 3bcc13b1c..4d927c748 100644 --- a/src/test/regress/script/OM/auto_upgradectl.sh +++ b/src/test/regress/script/OM/auto_upgradectl.sh @@ -21,9 +21,9 @@ password=`cat ${xmlpath} |grep -w "password"|awk -F'"' '{print $4}'` usergroup="dbgrp" envfilepath="${workdir}/om/env1" logfilesavepath=/home/OM/log -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 +upgradefilepath_om=${workdir}/openGauss/package/openGauss-1.1.0-CentOS-64bit-om.tar.gz +upgradefilepath_app=${workdir}/openGauss/package/openGauss-1.1.0-CentOS-64bit.tar.bz2 +upgradefilepath_app_sha256=${workdir}/openGauss/package/openGauss-1.1.0-CentOS-64bit.sha256 package_path=/home/openGauss-1.0.1-CentOS-b109-64bit.tar.gz shellfilepath=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) # 用户校验 diff --git a/src/test/regress/script/OM/automated-test.sh b/src/test/regress/script/OM/automated-test.sh index 89dad18b8..28463b4c7 100644 --- a/src/test/regress/script/OM/automated-test.sh +++ b/src/test/regress/script/OM/automated-test.sh @@ -1,4 +1,4 @@ -# !/bin/bash +#!/bin/bash # username:omm usergroup:dbgrp 工具脚本路径：/home/om/ xml文件路径：/home/om/cluster_1m0s_config.xml @@ -21,9 +21,9 @@ password=`cat ${xmlpath} |grep -w "password"|awk -F'"' '{print $4}'` usergroup="dbgrp" envfilepath="${workspace}/om/env" logfilesavepath=/usr1/opengaussautoinstall/log -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 +package_path_om=${workspace}/openGauss/package/openGauss-1.1.0-CentOS-64bit-om.tar.gz +package_path_app=${workspace}/openGauss/package/openGauss-1.1.0-CentOS-64bit.tar.bz2 +package_path_app_sha256=${workspace}/openGauss/package/openGauss-1.1.0-CentOS-64bit.sha256 shellfilepath=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) hostname=`hostname` ip=`hostname -i|awk '{print $1}'` From 25a151b9a90a5ca5538033c1997b8afd40c2de11 Mon Sep 17 00:00:00 2001 From: hangjin2020 <850894759@qq.com> Date: Mon, 28 Dec 2020 14:47:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/package.sh | 2 +- src/test/regress/script/OM/auto_upgradectl.sh | 4 ++-- src/test/regress/script/OM/automated-test.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/package.sh b/package/package.sh index a74cdf4bc..36e80c697 100644 --- a/package/package.sh +++ b/package/package.sh @@ -87,7 +87,7 @@ fi ##default install version storage path declare server_version='openGauss' declare server_name_for_package="$(echo ${server_version} | sed 's/ /-/g')" # replace blank with '-' for package name. -declare version_number='1.1.0' +declare version_number='1.0.1' ####################################################################### ##putout the version of server diff --git a/src/test/regress/script/OM/auto_upgradectl.sh b/src/test/regress/script/OM/auto_upgradectl.sh index 4d927c748..d455b6771 100644 --- a/src/test/regress/script/OM/auto_upgradectl.sh +++ b/src/test/regress/script/OM/auto_upgradectl.sh @@ -22,8 +22,8 @@ usergroup="dbgrp" envfilepath="${workdir}/om/env1" logfilesavepath=/home/OM/log upgradefilepath_om=${workdir}/openGauss/package/openGauss-1.1.0-CentOS-64bit-om.tar.gz -upgradefilepath_app=${workdir}/openGauss/package/openGauss-1.1.0-CentOS-64bit.tar.bz2 -upgradefilepath_app_sha256=${workdir}/openGauss/package/openGauss-1.1.0-CentOS-64bit.sha256 +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) # 用户校验 diff --git a/src/test/regress/script/OM/automated-test.sh b/src/test/regress/script/OM/automated-test.sh index 28463b4c7..72108fa13 100644 --- a/src/test/regress/script/OM/automated-test.sh +++ b/src/test/regress/script/OM/automated-test.sh @@ -22,8 +22,8 @@ usergroup="dbgrp" envfilepath="${workspace}/om/env" logfilesavepath=/usr1/opengaussautoinstall/log package_path_om=${workspace}/openGauss/package/openGauss-1.1.0-CentOS-64bit-om.tar.gz -package_path_app=${workspace}/openGauss/package/openGauss-1.1.0-CentOS-64bit.tar.bz2 -package_path_app_sha256=${workspace}/openGauss/package/openGauss-1.1.0-CentOS-64bit.sha256 +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}'`