From a68af63cf91bdee496d03b45220e1a81e1059020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=94=A6=E6=B3=A2?= <570157209@qq.com> Date: Tue, 20 Aug 2024 11:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0master=E5=88=86=E6=94=AF?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E8=87=B37.0.0-RC1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 +- script/base_diff/comm_constants.py | 2 +- script/upgrade_checker/dev/og_controller.py | 4 ++-- simpleInstall/install.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 046a220..2463e79 100644 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ declare binarylib_dir='None' declare gcc_version='10.3' declare module_name="openGauss-OM" -declare version_number='6.0.0' +declare version_number='7.0.0-RC1' declare version_Kernel='92.298' ROOT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) echo "ROOT_DIR : $ROOT_DIR" diff --git a/script/base_diff/comm_constants.py b/script/base_diff/comm_constants.py index a664e4a..2fa4021 100644 --- a/script/base_diff/comm_constants.py +++ b/script/base_diff/comm_constants.py @@ -20,7 +20,7 @@ class CommConstants: """ constants for open gauss.""" PACKAGE_TYPE = "bz2File" - VERSION_PATTERN = r'[0-9]+\.[0-9]+\.[0-9]+' + VERSION_PATTERN = r'(\d+\.\d+\.\d+)(-RC\d+)?' VERSION_EXAMPLE = "openGauss-1.0" PKG_SERVER = "Server" diff --git a/script/upgrade_checker/dev/og_controller.py b/script/upgrade_checker/dev/og_controller.py index 0b9a2a7..8a81d22 100644 --- a/script/upgrade_checker/dev/og_controller.py +++ b/script/upgrade_checker/dev/og_controller.py @@ -35,7 +35,7 @@ class OGController(object): @staticmethod def is_support_package(pkg): - # openGauss server:openGauss-Server-6.0.0-openEuler20.03-x86_64.tar.gz + # openGauss server:openGauss-Server-7.0.0-RC1-openEuler20.03-x86_64.tar.gz parts = os.path.basename(pkg).split('-') if len(parts) < 5 or parts[0] != 'openGauss' or parts[1] != 'Server': @@ -120,7 +120,7 @@ class OGController(object): Shell.run(cmd, print_desc='卸载数据库', check=True) if __name__ == "__main__": - og = OGController('/data/pkg/openGauss-Server-6.0.0-openEuler20.03-x86_64.tar.bz2') + og = OGController('/data/pkg/openGauss-Server-7.0.0-RC1-openEuler20.03-x86_64.tar.bz2') og.install() og.initdb() og.start(16666) diff --git a/simpleInstall/install.sh b/simpleInstall/install.sh index 714210d..91ffea3 100644 --- a/simpleInstall/install.sh +++ b/simpleInstall/install.sh @@ -8,7 +8,7 @@ then fi readonly cur_path=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd && cd - &>/dev/null) -readonly version="6.0.0" +readonly version="7.0.0-RC1" source $cur_path"/common.sh"