[BuildMonitor] BUGFIX : fix the status value

1. fix the status value of [build_image] & [sr_status_detail] tables

[build_image] table

 Before   | After
-------------------
'failed'  | 'F'
'success' | 'S'

[sr_status_detail] table

 Before   | After
-------------------
'ACCEPTED'| 'A'
'REVOKED' | 'R'

2. remove useless comment

Change-Id: I8464e31df57450f76fd1052f92037de3178bc267
Signed-off-by: SungHun Hwang <sh0924.hwang@samsung.com>

diff --git a/job_buildmonitor.py b/job_buildmonitor.py
index 83509c5..26a3eaf 100644 (file)
--- a/job_buildmonitor.py
+++ b/job_buildmonitor.py
@@ -339,7 +339,6 @@ def num_failed_packages_except_aggregate(build_project_id):
                     if build_status[repo][arch][pkg] == 'failed':
                         failed_packages_cnt += 1
 
-
     # return the number of failed packages except *_aggregate packages.
     return failed_packages_cnt
 
@@ -655,14 +654,16 @@ def update_fail_create_image_for_sr_stage(fields, bm_start_datetime):
                       curr_sr_status_id, info_stage_id, post_build_project_id)
         buildmonitor_db.do_query(query, query_data)
 
-# [17_0110] TODO check buildid, snapshot_id
 def create_image_for_build_image(fields, bm_start_datetime,
                                  bm_end_datetime, build_id, bm_img_size):
     print '[%s] enter create_image_for_build_image\n' % (__file__)
 
     bm_repository = fields['repo']
     bm_device_name = fields['name']
-    bm_status = fields['status']
+    if fields['status'].lower() == 'failed':
+        bm_status = 'F'
+    else:
+        bm_status = 'S'
     bm_url = fields['url']
     #print '[%s] bm_repository(%s), bm_device_name(%s), bm_status(%s), bm_url(%s)\n' \
     #      % (__file__, bm_repository, bm_device_name, bm_status, bm_url)
@@ -690,7 +691,6 @@ def end_create_image_for_sr_stage(bm_start_datetime, project):
 
     bm_end_datetime = datetime.datetime.now()
 
-    #if project.startswith("home:prerelease:"):
     if project.startswith("home:prerelease:") or project.startswith("home:trbs:"):
         bm_git_tag = project.split(":")[-3] + '/' + project.split(":")[-2] + '/' + project.split(":")[-1]
         #print '[%s] bm_git_tag(%s)\n' % (__file__, bm_git_tag)
@@ -907,7 +907,7 @@ def sr_accept_reject_for_sr_status_detail(event_fields, bm_start_datetime,
                 "obs_request_comment = %s, obs_request_date = %s, obs_request_status = %s " \
                 "WHERE pre_build_project_id = %s"
         query_data = (post_build_project_id, obs_req_no, obs_req_comment,
-                      obs_req_date, obs_req_status, pre_build_project_id)
+                      obs_req_date, 'A', pre_build_project_id)
         buildmonitor_db.do_query(query, query_data)
 
         ### for sr_stage (now can find the build_project_id of the target prj)
@@ -931,7 +931,7 @@ def sr_accept_reject_for_sr_status_detail(event_fields, bm_start_datetime,
                 "obs_request_comment = %s, obs_request_date = %s, obs_request_status = %s " \
                 "WHERE pre_build_project_id = %s"
         query_data = (obs_req_no, obs_req_comment, obs_req_date,
-                      obs_req_status, pre_build_project_id)
+                      'R', pre_build_project_id)
         buildmonitor_db.do_query(query, query_data)
 
         ### for sr_stage
@@ -1114,7 +1114,6 @@ def end_create_snapshot_create_images_for_sr_stage(project, bm_start_datetime,
         info_stage_id = POST_IMAGE
         query = "UPDATE sr_stage SET stage_end_time = %s, stage_status = %s " \
                 "WHERE sr_status_id = %s AND info_stage_id = %s AND build_project_id = %s"
-        #query_data = (bm_end_datetime, 'S',
         query_data = (bm_end_datetime, 'R',
                       each_sr_status_id[0], info_stage_id, post_build_project_id)
         buildmonitor_db.do_query(query, query_data)
@@ -1247,8 +1246,6 @@ def TRBS_sr_submit_for_sr_stage(curr_sr_status_id, bm_start_datetime,
                   bm_end_datetime, 'S', trbs_build_project_id)
     buildmonitor_db.do_query(query, query_data)
 
-
-
 def TRBS_package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime,
                                          bm_end_datetime, bm_src_project_lst):
     print '[%s] enter TRBS_package_build_for_sr_detail_sr_stage\n' % (__file__)