From 3db852bc8911d5be57420d9ac91471e871fd5bc2 Mon Sep 17 00:00:00 2001 From: dongjie110 <17621827400@163.com> Date: Mon, 25 Jul 2022 17:07:57 +0800 Subject: [PATCH 1/5] stop master operation in obs_meta --- core/check_meta_service.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/core/check_meta_service.py b/core/check_meta_service.py index 27c522c..a18ecde 100644 --- a/core/check_meta_service.py +++ b/core/check_meta_service.py @@ -695,6 +695,28 @@ class CheckMetaPull(object): log.info("******CHECK PR RULE********") log.info("check pr rule finished,please wait other check!!!") + def _check_pr_master(self, change_file): + ''' + check add pkg is master + params + chang_file : modified file abs path + ''' + log.info("******CHECK PR MASTER PKGNAME*********") + failed_msg = [] + for file in change_file: + path_info = self._get_path_info(file) + pkg_name = path_info[0] + if 'master' in file: + log.error("check failed this pkg:{} in master branch".format(pkg_name)) + failed_msg.append(pkg_name) + failed_flag = True + else: + log.info("check success this pkg:{}".format(pkg_name)) + if failed_flag: + log.error("this below pkgs in master branch:{}".format(failed_msg)) + raise SystemExit("*******CHECK PR MASTER PKGNAME ERROR:please check your PR*******") + log.info("******CHECK PR MASTER PKGNAME*********") + def do_all(self): """ @@ -703,6 +725,7 @@ class CheckMetaPull(object): if self.prid and self.token: release_management_data = self._release_management_tree() change_result, complete_change_result = self._get_all_change_file() + self._check_pr_master(change_result) pr_check_result = self._check_pr_rule(release_management_data, complete_change_result) self._check_private_sig_pkg(change_result) check_result = self._check_service_meta(change_result) -- Gitee From 096ec6f73d92701faa6dbd42aa5c8849d8af6c01 Mon Sep 17 00:00:00 2001 From: dongjie110 <17621827400@163.com> Date: Wed, 27 Jul 2022 17:12:20 +0800 Subject: [PATCH 2/5] ssa --- core/check_release_management.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/check_release_management.py b/core/check_release_management.py index c38fdc3..b6e2c97 100644 --- a/core/check_release_management.py +++ b/core/check_release_management.py @@ -710,6 +710,7 @@ class CheckReleaseManagement(object): error_names.remove(pkg['name']) break if error_names: + log.error("branch:{}----{}".format(branch,error_names)) error_flag =True for pkg in pkgs: if pkg['name'] in error_names: -- Gitee From c9f85d2a17ea3fa18e15ef8d6cfab9c5c26b5cbd Mon Sep 17 00:00:00 2001 From: dongjie110 <17621827400@163.com> Date: Fri, 29 Jul 2022 13:53:22 +0800 Subject: [PATCH 3/5] del log --- core/check_release_management.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/check_release_management.py b/core/check_release_management.py index b6e2c97..283ff44 100644 --- a/core/check_release_management.py +++ b/core/check_release_management.py @@ -843,11 +843,11 @@ class CheckReleaseManagement(object): same_pkg[branch].append(new['name']) new_pkg[branch].append(new['name']) change_infos[branch] = new_msgs - for branch,pkgs in change_infos.items(): - if pkgs: - log.info("change in:{}".format(branch)) - for pkg in pkgs: - log.info(pkg) + # for branch,pkgs in change_infos.items(): + # if pkgs: + # log.info("change in:{}".format(branch)) + # for pkg in pkgs: + # log.info(pkg) if error_pkg_flag: log.error("May be {0} should not be delete".format(error_pkg)) raise SystemExit("ERROR: Please check your PR") -- Gitee From 9e9aa5ebafe2fe2f4cdda6b4478817d997f899b4 Mon Sep 17 00:00:00 2001 From: dongjie110 <17621827400@163.com> Date: Fri, 29 Jul 2022 14:26:30 +0800 Subject: [PATCH 4/5] ss --- core/check_release_management.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/check_release_management.py b/core/check_release_management.py index 283ff44..311bc32 100644 --- a/core/check_release_management.py +++ b/core/check_release_management.py @@ -468,6 +468,7 @@ class CheckReleaseManagement(object): branch = branch.replace("-",":") if pkg['obs_from']: if 'Multi-Version' in branch: + branch = branch.replace("_",":") from_result = self._find_master_meta_path(pkg, ctype='multi-from') else: from_result = self._find_master_meta_path(pkg) -- Gitee From 9021aee34d20ae4e69b3e0af6be12d653f382bae Mon Sep 17 00:00:00 2001 From: dongjie110 <17621827400@163.com> Date: Fri, 29 Jul 2022 14:38:46 +0800 Subject: [PATCH 5/5] wwew --- core/check_release_management.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/check_release_management.py b/core/check_release_management.py index 311bc32..182451d 100644 --- a/core/check_release_management.py +++ b/core/check_release_management.py @@ -465,26 +465,26 @@ class CheckReleaseManagement(object): for branch,pkgs in add_infos.items(): log.info('check branch:{} add pkgs obs_from check running...'.format(branch)) for pkg in pkgs: - branch = branch.replace("-",":") if pkg['obs_from']: if 'Multi-Version' in branch: - branch = branch.replace("_",":") + c_branch = branch.replace("_",":") from_result = self._find_master_meta_path(pkg, ctype='multi-from') else: + c_branch = branch.replace("-",":") from_result = self._find_master_meta_path(pkg) if from_result: error_flag = True - if error_infos.get(branch,[]): - error_infos[branch].append(pkg) + if error_infos.get(c_branch,[]): + error_infos[c_branch].append(pkg) else: - error_infos[branch] = [pkg] - if pkg['obs_to'] != branch: + error_infos[c_branch] = [pkg] + if pkg['obs_to'] != c_branch: error_flag = True log.error("pkg name:{2} Wrong obs_to: in !!!".format(pkg['obs_to'],branch,pkg['name'])) - if error_infos.get(branch,[]): - error_infos[branch].append(pkg) + if error_infos.get(c_branch,[]): + error_infos[c_branch].append(pkg) else: - error_infos[branch] = [pkg] + error_infos[c_branch] = [pkg] if error_infos: log.error("some errors in your commit,please check: {}".format(error_infos)) return error_flag -- Gitee