From b14104f6b304dc2cce4164fea884732171e0503e Mon Sep 17 00:00:00 2001 From: hyokeun Date: Tue, 20 Feb 2018 14:12:40 +0900 Subject: [PATCH] SR auto reject purge date from DB Change-Id: I1b64f5ba8f274ec69d6eabafc1c99a976387f94e --- common/buildmonitor_extention.py | 12 ++++++------ job_repa_auto_reject.py | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/buildmonitor_extention.py b/common/buildmonitor_extention.py index 6cc2b55..4033600 100644 --- a/common/buildmonitor_extention.py +++ b/common/buildmonitor_extention.py @@ -78,14 +78,14 @@ class BuildMonitorExtention(object): if not self.is_connect(): return [] - prj_list = [] - - query = "SELECT name FROM main_project WHERE sr_auto_reject = %s" - query_data = "1" + prj_list = {} + + query = "SELECT name, sr_auto_reject FROM main_project WHERE sr_auto_reject <> %s" + query_data =("0",) projects = get_multi_values_from_query_data(query, query_data) for prj in projects: - prj_list.append("%s" %(prj)) - + prj_list[prj[0]] = int(prj[1]) + return prj_list def get_build_project_id(self, project): diff --git a/job_repa_auto_reject.py b/job_repa_auto_reject.py index 17e5455..67df439 100644 --- a/job_repa_auto_reject.py +++ b/job_repa_auto_reject.py @@ -121,7 +121,6 @@ def trigger_next_to_repa(project, tag, obs_user, decision, comment, count): info_f.write(data) print data - def main(): """Script entry point. """ @@ -134,8 +133,11 @@ def main(): count = 0 repa_decision = 'declined' - for project in bm_ext.get_auto_reject_projects(): - for sr_tag in auto_reject_submission_list(build, project): + bm_list = bm_ext.get_auto_reject_projects() + print bm_list + for project in bm_list: + num_of_days = bm_list[project] + for sr_tag in auto_reject_submission_list(build, project, purge_day=num_of_days): print 'sr_tag : %s' %(sr_tag) repa_comment = "Auto Rejected Submission " + sr_tag bm_ext.update_sr_accept_log( project, sr_tag, obs_user, repa_comment, repa_decision) -- 2.7.4