diff --git a/deploy/comm/check.py b/deploy/comm/check.py index 071dbb4..958e830 100644 --- a/deploy/comm/check.py +++ b/deploy/comm/check.py @@ -349,14 +349,14 @@ def checkVersionUtil(fisco_ver_str,webase_front_ver_str): log.info("checkVersionUtil webase: {} and fisco version: {}".format(webase_front_ver_str, fisco_ver_str)) fisco_version_int = int(re.findall("\d+", fisco_ver_str)[0]) * 100 + int(re.findall("\d+", fisco_ver_str)[1]) * 10 + int(re.findall("\d+", fisco_ver_str)[2]) * 1 # webase-front version greater or equal with other webase version - webase_front_version_int = int(re.findall("\d+", webase_front_ver_str)[0]) * 100 + int(re.findall("\d+", webase_front_ver_str)[1]) * 10 + int(re.findall("\d+", webase_front_ver_str)[2]) * 1 - log.info("checkVersionUtil int webase: {} and fisco version: {}".format(webase_front_version_int, fisco_version_int)) + # webase_front_version_int = int(re.findall("\d+", webase_front_ver_str)[0]) * 100 + int(re.findall("\d+", webase_front_ver_str)[1]) * 10 + int(re.findall("\d+", webase_front_ver_str)[2]) * 1 + # log.info("checkVersionUtil int webase: {} and fisco version: {}".format(webase_front_version_int, fisco_version_int)) flag=False - # require if webase < 2.0.0, fisco < 3.0.0 - if ( webase_front_version_int < 200 and fisco_version_int >= 300 ): + # require if webase = 'lab*' + if not webase_front_ver_str.startswith('lab'): flag=True - # require if webase >= 2.0.0, fisco >= 3.0.0 - if ( webase_front_version_int >= 200 and fisco_version_int < 300 ): + # require if webase = 'lab*', fisco >= 3.0.0 + if (webase_front_ver_str.startswith('lab') and fisco_version_int < 300 ): flag=True # if version conflicts, exit diff --git a/deploy/common.properties b/deploy/common.properties index 15bd066..8b6c340 100644 --- a/deploy/common.properties +++ b/deploy/common.properties @@ -1,9 +1,9 @@ [common] -# Webase Subsystem Version (v2.0.0 or above) -webase.web.version=v2.0.0-rc1 -webase.mgr.version=v2.0.0-rc1 -webase.sign.version=v2.0.0-rc1 -webase.front.version=v2.0.0-rc1 +# Webase Subsystem Version (lab-rc1) +webase.web.version=lab-rc1 +webase.mgr.version=lab-rc1 +webase.sign.version=lab-rc1 +webase.front.version=lab-rc1 # Mysql database configuration of WeBASE-Node-Manager mysql.ip=localhost diff --git a/release_note.txt b/release_note.txt index 1e7ab69..f211e1c 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v2.0.0-rc1 +lab-rc1