From 8c5b0766fcca5ddf2ec89a65a09cfde365656b7f Mon Sep 17 00:00:00 2001 From: SungHun Hwang Date: Thu, 10 Nov 2016 15:53:08 +0900 Subject: [PATCH] [BuildMonitor] fix the TypeError bug at Python 2.7.8 Change-Id: I8912017fd147ea9acca52a6fef99221564093b2a Signed-off-by: SungHun Hwang --- job_buildmonitor.py | 161 ++++++++++++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 88 deletions(-) diff --git a/job_buildmonitor.py b/job_buildmonitor.py index 039f7eb..e2c4e41 100644 --- a/job_buildmonitor.py +++ b/job_buildmonitor.py @@ -80,7 +80,7 @@ def sr_submit_for_sr_status(bm_git_tag): # get curr_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) @@ -99,7 +99,7 @@ def sr_submit_for_sr_commit(commit_date, commit_msg, submit_date, submit_msg, # get current_sr_status_id (should be here, after sr_submit_for_sr_status) query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (git_tag) + query_data = (git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) @@ -124,7 +124,7 @@ def start_pre_build_for_sr_stage(git_tag, bm_start_datetime, # get current_sr_status_id (should be here after sr_submit_for_sr_status) query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (git_tag) + query_data = (git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) @@ -161,7 +161,7 @@ def package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime, # get current_sr_status_id (should be here after sr_submit_for_sr_status) query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (git_tag) + query_data = (git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) @@ -173,10 +173,10 @@ def package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime, # get info_project_id -> get pre_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_src_project) + query_data = (bm_src_project,) info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (info_project_id) + query_data = (info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) print '[%s] info_project_id(%s), pre_build_project_id(%s)\n' \ % (__file__, info_project_id, pre_build_project_id) @@ -191,7 +191,7 @@ def package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime, if sr_status_detail_id == 9876 or sr_status_detail_id == 0: # get pre_build_project_id query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (info_project_id) + query_data = (info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### for sr_status_detail @@ -217,18 +217,18 @@ def package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime, # get build_snapshot_id for deleting build_snapshot_package & build_image query = "SELECT id FROM build_snapshot WHERE build_project_id = %s" - query_data = (pre_build_project_id) + query_data = (pre_build_project_id,) build_snapshot_id = buildmonitor_db.get_value_from_query_data(query, query_data) # delete build_snapshot & build_snapshot_package & build_image query = "DELETE FROM build_snapshot WHERE build_project_id = %s" - query_data = (pre_build_project_id) + query_data = (pre_build_project_id,) buildmonitor_db.do_query(query, query_data) query = "DELETE FROM build_snapshot_package WHERE build_snapshot_id = %s" - query_data = (build_snapshot_id) + query_data = (build_snapshot_id,) buildmonitor_db.do_query(query, query_data) query = "DELETE FROM build_image WHERE build_snapshot_id = %s" - query_data = (build_snapshot_id) + query_data = (build_snapshot_id,) buildmonitor_db.do_query(query, query_data) ### for sr_stage for multi profile @@ -247,16 +247,16 @@ def update_fail_status_for_sr_stage(project, bm_git_tag): # get curr_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id (%s)\n' % (__file__, curr_sr_status_id) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [3] stage end : update fail status [pre] snapshot creation @@ -271,15 +271,15 @@ def start_pre_create_snapshot_for_sr_stage(project, bm_git_tag, bm_start_datetim # get curr_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get multi_build_status from build_target @@ -319,10 +319,10 @@ def start_pre_create_snapshot_for_build_snapshot(project, bm_start_datetime): # get pre_info_project_id -> get pre_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) pre_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (pre_info_project_id) + query_data = (pre_info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] pre_info_project_id(%s), pre_build_project_id(%s)\n' \ # % (__file__, pre_info_project_id, pre_build_project_id) @@ -342,17 +342,17 @@ def create_snapshot_packages_for_build_snapshot_package(project, bm_repo, bm_arc # get pre_info_project_id -> get pre_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) pre_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (pre_info_project_id) + query_data = (pre_info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] pre_info_project_id(%s), pre_build_project_id(%s)\n' \ # % (__file__, pre_info_project_id, pre_build_project_id) # get curr_build_snapshot_id query = "SELECT id FROM build_snapshot WHERE build_project_id = %s" - query_data = (pre_build_project_id) + query_data = (pre_build_project_id,) curr_build_snapshot_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_build_snapshot_id(%s)\n' % (__file__, curr_build_snapshot_id) @@ -373,15 +373,15 @@ def end_pre_create_snapshot_for_sr_stage(project, bm_git_tag, # get curr_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [3] stage end : [pre] snapshot creation @@ -406,10 +406,10 @@ def end_pre_create_snapshot_for_build_snapshot(project, bm_snapshot_name, # get pre_info_project_id -> get pre_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) pre_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (pre_info_project_id) + query_data = (pre_info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] pre_info_project_id(%s), pre_build_project_id(%s)\n' \ # % (__file__, pre_info_project_id, pre_build_project_id) @@ -442,17 +442,17 @@ def update_fail_create_image_for_sr_stage(fields, bm_start_datetime): # [pre_build] get current_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s][pre_build] info_stage_id(%s), query_data(%s), curr_sr_status_id(%s)\n' \ # % (__file__, info_stage_id, query_data, curr_sr_status_id) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_prj_name) + query_data = (bm_prj_name,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [4] stage : update fail status for [pre] image creation @@ -465,16 +465,16 @@ def update_fail_create_image_for_sr_stage(fields, bm_start_datetime): else: # get post_info_project_id -> get post_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_prj_name) + query_data = (bm_prj_name,) post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get curr_sr_status_id query = "SELECT sr_status_id FROM sr_status_detail WHERE post_build_project_id = %s" - query_data = (post_build_project_id) + query_data = (post_build_project_id,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) @@ -506,7 +506,7 @@ def create_image_for_build_image(fields, bm_start_datetime, # get curr_build_snapshot_id query = "SELECT id FROM build_snapshot WHERE snapshot_name = %s" - query_data = (build_id) + query_data = (build_id,) curr_build_snapshot_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_build_snapshot_id(%s)\n' % (__file__, curr_build_snapshot_id) @@ -532,17 +532,17 @@ def end_create_image_for_sr_stage(bm_start_datetime, project): # [pre_build] get current_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s][pre_build] query_data(%s), curr_sr_status_id(%s)\n' \ # % (__file__, query_data, curr_sr_status_id) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [4] stage : [pre] image creation @@ -562,16 +562,16 @@ def sr_accept_for_sr_stage(bm_src_prj_name, bm_target_prj_name, # get current_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_src_prj_name) + query_data = (bm_src_prj_name,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [5] stage : SR aceept @@ -585,11 +585,11 @@ def sr_accept_for_sr_stage(bm_src_prj_name, bm_target_prj_name, # get curr_info_project_id -> get post_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_target_prj_name) + query_data = (bm_target_prj_name,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [6] stage start : [post] package build @@ -607,16 +607,16 @@ def sr_reject_for_sr_stage(bm_src_prj_name, bm_start_datetime, # get curr_sr_status_id query = "SELECT id FROM sr_status WHERE sr = %s" - query_data = (bm_git_tag) + query_data = (bm_git_tag,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] curr_sr_status_id(%s)\n' % (__file__, curr_sr_status_id) # get curr_info_project_id -> get curr_build_project_id for multi profile query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_src_prj_name) + query_data = (bm_src_prj_name,) curr_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (curr_info_project_id) + query_data = (curr_info_project_id,) curr_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### [5] stage : SR reject @@ -649,21 +649,21 @@ def sr_accept_reject_for_sr_status_detail(event_fields, bm_start_datetime, # get pre_info_project_id -> get pre_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_src_prj_name) # should use bm_src_prj_name + query_data = (bm_src_prj_name,) # should use bm_src_prj_name pre_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (pre_info_project_id) + query_data = (pre_info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] pre_info_project_id(%d), pre_build_project_id(%s)\n' \ # % (__file__, pre_info_project_id, pre_build_project_id) # get post_info_project_id -> get post_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_target_prj_name) + query_data = (bm_target_prj_name,) post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] post_info_project_id(%s), post_build_project_id(%s)\n' \ # % (__file__, post_info_project_id, post_build_project_id) @@ -686,10 +686,10 @@ def sr_accept_reject_for_sr_status_detail(event_fields, bm_start_datetime, # get info_project_id -> get pre_build_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (bm_src_prj_name) + query_data = (bm_src_prj_name,) info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) query = "SELECT id FROM build_project WHERE info_project_id = %s" - query_data = (info_project_id) + query_data = (info_project_id,) pre_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) ### for sr_status_detail @@ -712,18 +712,18 @@ def update_fail_create_snapshot_for_sr_stage(project): # get post_info_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) # Tizen:Mobile + query_data = (project,) # Tizen:Mobile post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get post_build_project_id query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get curr_sr_status_id query = "SELECT sr_status_id FROM sr_status_detail WHERE post_build_project_id = %s" - query_data = (post_build_project_id) + query_data = (post_build_project_id,) curr_sr_status_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] post_info_project_id(%s), post_build_project_id(%d), curr_sr_status_id(%s)\n' \ # % (__file__, post_info_project_id, post_build_project_id, curr_sr_status_id) @@ -741,18 +741,18 @@ def start_create_snapshot_for_sr_stage(project, bm_start_datetime): # get post_info_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) # Tizen:Mobile + query_data = (project,) # Tizen:Mobile post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get post_build_project_id query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get multi_sr_status_id query = "SELECT sr_status_id FROM sr_status_detail WHERE post_build_project_id = %s" - query_data = (post_build_project_id) + query_data = (post_build_project_id,) multi_sr_status_id = buildmonitor_db.get_multi_values_from_query_data(query, query_data) #print '[%s] post_info_project_id(%s), post_build_project_id(%d), multi_sr_status_id(%s)\n' \ # % (__file__, post_info_project_id, post_build_project_id, multi_sr_status_id) @@ -790,13 +790,13 @@ def start_create_snapshot_for_post_build_snapshot(project, bm_snapshot_name, # get post_info_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get post_build_project_id query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] post_info_project_id(%s), post_build_project_id(%d)\n' \ # % (__file__, post_info_project_id, post_build_project_id) @@ -816,19 +816,19 @@ def create_snapshot_packages_for_post_build_snapshot_package(project, bm_repo, b # get post_info_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] post_info_project_id (%s)\n' % (__file__, post_info_project_id) # get post_build_project_id query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get curr_build_snapshot_id query = "SELECT id FROM build_snapshot WHERE build_project_id = %s" - query_data = (build_project_id) + query_data = (build_project_id,) curr_build_snapshot_id = buildmonitor_db.get_value_from_query_data(query, query_data) for each_pkg_name, each_pkg_mdate, each_pkg_size in zip(bm_pkg_name_lst, bm_pkg_mdate_lst, bm_pkg_size_lst): @@ -850,18 +850,18 @@ def end_create_snapshot_create_images_for_sr_stage(project, bm_start_datetime, ### [7/8/9] end : [post] snapshot creation / [post] image creation / Completed # get post_info_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) # Tizen:Mobile + query_data = (project,) # Tizen:Mobile post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get post_build_project_id query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get multi_sr_status_id query = "SELECT sr_status_id FROM sr_status_detail WHERE post_build_project_id = %s" - query_data = (post_build_project_id) + query_data = (post_build_project_id,) multi_sr_status_id = buildmonitor_db.get_multi_values_from_query_data(query, query_data) #print '[%s] post_info_project_id(%s), post_build_project_id(%d), multi_sr_status_id(%s)\n' \ # % (__file__, post_info_project_id, post_build_project_id, multi_sr_status_id) @@ -900,13 +900,13 @@ def end_create_snapshot_for_post_build_snapshot(project, bm_start_datetime, # get post_info_project_id query = "SELECT id FROM info_project WHERE project_name = %s" - query_data = (project) + query_data = (project,) post_info_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) # get post_build_project_id query = "SELECT id FROM build_project " \ "WHERE info_project_id = %s ORDER BY id desc LIMIT 1" - query_data = (post_info_project_id) + query_data = (post_info_project_id,) post_build_project_id = buildmonitor_db.get_value_from_query_data(query, query_data) #print '[%s] post_info_project_id(%s), post_build_project_id(%d)\n' \ # % (__file__, post_info_project_id, post_build_project_id) @@ -985,7 +985,7 @@ def main(): bm_end_datetime) elif bm_stage == 'Pre_Snap_packages': - print '[%s][Pre_Snap_Fail]\n' % (__file__) + print '[%s][Pre_Snap_packages]\n' % (__file__) # get vars project = content.get("project") bm_repo = content.get("bm_repo") @@ -1009,8 +1009,7 @@ def main(): # func call update_fail_status_for_sr_stage(project, bm_git_tag) #======================================================= - # [PRE] Image - #elif bm_stage == 'Pre_Image': + # [PRE][POST] Image elif bm_stage == 'Image': print '[%s][Image]\n' % (__file__) # get vars @@ -1028,6 +1027,8 @@ def main(): bm_end_datetime, build_id) elif image_status == 'failed': update_fail_create_image_for_sr_stage(fields, bm_start_datetime) + #======================================================= + # [PRE][POST] Post_Image elif bm_stage == 'Post_Image': print '[%s][Post_Image]\n' % (__file__) # get vars @@ -1077,8 +1078,7 @@ def main(): bm_pkg_mdate_lst = content.get("bm_pkg_mdate_lst") bm_pkg_size_lst = content.get("bm_pkg_size_lst") # func call - create_snapshot_packages_for_post_build_snapshot_package(repo, - project, + create_snapshot_packages_for_post_build_snapshot_package(project, bm_repo, bm_arch, bm_pkg_url, @@ -1118,22 +1118,7 @@ def main(): #bm_disconnect_db() ''' - elif bm_stage == 'Post_Snap': - print 'Post_Snap\n' - bm_stage_func = content.get("bm_stage_func") - if bm_stage_func == 'update_fail_create_snapshot_for_sr_stage' - print 'update_fail_create_snapshot_for_sr_stage\n' - elif bm_stage_func == 'start_create_snapshot_for_post_build_snapshot' - print 'start_create_snapshot_for_post_build_snapshot\n' - elif bm_stage_func == 'create_snapshot_packages_for_post_build_snapshot_package' - print 'create_snapshot_packages_for_post_build_snapshot_package\n' - elif bm_stage_func == 'start_create_snapshot_for_sr_stage' - print 'start_create_snapshot_for_sr_stage\n' - elif bm_stage_func == 'end_create_snapshot_create_images_for_sr_stage' - print 'end_create_snapshot_create_images_for_sr_stage\n' - else - print 'else\n' - ''' + if __name__ == '__main__': try: -- 2.7.4