Call buildmonitor only if submit is successful

Change-Id: Ie540420b1d2e0d2d3ee5db4421bb35d6e710613b

diff --git a/job_submit.py b/job_submit.py
index 45ddd42..78a5fb1 100755 (executable)
--- a/job_submit.py
+++ b/job_submit.py
@@ -627,44 +627,44 @@ def main(build_type, build, event, sr_count):
     if submit_info['pre_created']:
         send_mail_sr_message(submit_info)
 
-    if buildmonitor_enabled:
-        bm_end_datetime = datetime.datetime.now()
-        commit_date, cd_err, cd_ret = mygit._git_inout('show', ['-s', '--format=%ci'])
-        commit_msg, cm_err, cm_ret = mygit._git_inout('show', ['-s', '--format=%s'])
-        submit_date, sd_err, sd_ret = mygit._git_inout('for-each-ref', \
-                    ['--count=1', '--sort=-taggerdate', '--format=%(taggerdate:iso)', 'refs/tags/%s' % git_tag])
-        submit_msg, sm_err, sm_ret = mygit._git_inout('for-each-ref', \
-                    ['--count=1', '--sort=-taggerdate', '--format=%(subject)', 'refs/tags/%s' % git_tag])
-        submitter, st_err, st_ret = mygit._git_inout('for-each-ref', \
-                    ['--count=1', '--sort=-taggerdate', '--format=%(taggeremail)', 'refs/tags/%s' % git_tag])
-        #print '[%s] %s%s' % (__file__, commit_date, commit_msg)
-        #print '[%s] %s%s%s' % (__file__, submit_date, submit_msg, submitter)
-
-        ### sr_status -> sr_commit -> sr_stage & sr_status_detail
-        #buildmonitor.sr_submit_for_sr_status(git_tag)
-        #buildmonitor.sr_submit_for_sr_commit(mygit, git_tag, gerrit_project,
-        #                                     gerrit_newrev, gerrit_account_name)
-        #buildmonitor.package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime,
-        #                                                  bm_end_datetime,
-        #                                                  submit_info['pre_created'])
-        bm_stage = 'Submit'
-        bm_data = {"bm_stage" : bm_stage,
-                   "commit_date" : commit_date,
-                   "commit_msg" : commit_msg,
-                   "submit_date" : submit_date,
-                   "submit_msg" : submit_msg,
-                   "submitter" : submitter,
-                   "git_tag" : git_tag,
-                   "obs_package_name" : package,
-                   "gerrit_project" : event['project'],
-                   "gerrit_newrev" : event['newrev'],
-                   "gerrit_account_name" : gerrit_account_name,
-                   "bm_start_datetime": str(bm_start_datetime),
-                   "bm_end_datetime": str(bm_end_datetime),
-                   "bm_src_project_lst": submit_info['pre_created']
-                    }
-        ### sr_status -> sr_commit -> sr_stage & sr_status_detail
-        trigger_next("BUILD-MONITOR_%d" % sr_count, bm_data)
+        if buildmonitor_enabled:
+            bm_end_datetime = datetime.datetime.now()
+            commit_date, cd_err, cd_ret = mygit._git_inout('show', ['-s', '--format=%ci'])
+            commit_msg, cm_err, cm_ret = mygit._git_inout('show', ['-s', '--format=%s'])
+            submit_date, sd_err, sd_ret = mygit._git_inout('for-each-ref', \
+                        ['--count=1', '--sort=-taggerdate', '--format=%(taggerdate:iso)', 'refs/tags/%s' % git_tag])
+            submit_msg, sm_err, sm_ret = mygit._git_inout('for-each-ref', \
+                        ['--count=1', '--sort=-taggerdate', '--format=%(subject)', 'refs/tags/%s' % git_tag])
+            submitter, st_err, st_ret = mygit._git_inout('for-each-ref', \
+                        ['--count=1', '--sort=-taggerdate', '--format=%(taggeremail)', 'refs/tags/%s' % git_tag])
+            #print '[%s] %s%s' % (__file__, commit_date, commit_msg)
+            #print '[%s] %s%s%s' % (__file__, submit_date, submit_msg, submitter)
+
+            ### sr_status -> sr_commit -> sr_stage & sr_status_detail
+            #buildmonitor.sr_submit_for_sr_status(git_tag)
+            #buildmonitor.sr_submit_for_sr_commit(mygit, git_tag, gerrit_project,
+            #                                     gerrit_newrev, gerrit_account_name)
+            #buildmonitor.package_build_for_sr_detail_sr_stage(git_tag, bm_start_datetime,
+            #                                                  bm_end_datetime,
+            #                                                  submit_info['pre_created'])
+            bm_stage = 'Submit'
+            bm_data = {"bm_stage" : bm_stage,
+                       "commit_date" : commit_date,
+                       "commit_msg" : commit_msg,
+                       "submit_date" : submit_date,
+                       "submit_msg" : submit_msg,
+                       "submitter" : submitter,
+                       "git_tag" : git_tag,
+                       "obs_package_name" : package,
+                       "gerrit_project" : event['project'],
+                       "gerrit_newrev" : event['newrev'],
+                       "gerrit_account_name" : gerrit_account_name,
+                       "bm_start_datetime": str(bm_start_datetime),
+                       "bm_end_datetime": str(bm_end_datetime),
+                       "bm_src_project_lst": submit_info['pre_created']
+                        }
+            ### sr_status -> sr_commit -> sr_stage & sr_status_detail
+            trigger_next("BUILD-MONITOR_%d" % sr_count, bm_data)
 
 if __name__ == '__main__':
     #try: