Manual SR Sync - Set submitter to triggered user

Change-Id: I64f3d1adc631ce3799e07d577de31dff852e56a3

diff --git a/job_submit_request_sync.py b/job_submit_request_sync.py
index 175ee27..3cec389 100644 (file)
--- a/job_submit_request_sync.py
+++ b/job_submit_request_sync.py
@@ -136,6 +136,8 @@ def main():
     reason = 'SR-SYNC'
     snapshot = None
     project_to_create_timestamp = None
+    triggered_by = "tizen.build@samsung.com"
+
     if os.getenv('UPSTREAM_SNAPSHOT', None) and os.getenv('UPSTREAM_OBS_PROJECT', None):
         snapshot = os.getenv('UPSTREAM_SNAPSHOT')
         project = os.getenv('UPSTREAM_OBS_PROJECT')
@@ -155,6 +157,7 @@ def main():
         project = manual_trigger.get('source')
         target_project = manual_trigger.get('target')
         project_to_create_timestamp = manual_trigger.get('project_to_create_timestamp')
+        triggered_by = manual_trigger.get('useremail', triggered_by)
         # Parse triggered data
         official_data = touch_trigger_data(manual_trigger)
     else: # Consider file parameter comes
@@ -166,6 +169,7 @@ def main():
         project = manual_trigger.get('source')
         target_project = manual_trigger.get('target')
         project_to_create_timestamp = manual_trigger.get('project_to_create_timestamp')
+        triggered_by = manual_trigger.get('useremail', triggered_by)
         # Parse triggered data
         official_data = touch_trigger_data(manual_trigger)
 
@@ -318,7 +322,7 @@ def main():
                        "commit_msg" : "N/A",
                        "submit_date" : str(bm_end_datetime),
                        "submit_msg" : "N/A",
-                       "submitter" : "<tizen.build@samsung.com>",
+                       "submitter" : "<%s>" % triggered_by,
                        "bm_member_sr_info" : {project_to_create: requests_item[project_to_create][r:(r+split_step)]},
                        "bm_sync_git_tag" : bm_sync_git_tag,
                        "gerrit_project" : "N/A",
@@ -331,7 +335,7 @@ def main():
             trigger_next("BUILD-MONITOR_%s_%d" % (bm_stage, r), bm_data)
 
         # Mail notification
-        if True:
+        if False:
             mymail = MailSender()
             if len(snapshot.split(',')) > 1:
                 mymail.add_title('[SR-Sync] %s(Manual) => %s' % (ret_data.get('project'), target_project))
@@ -377,7 +381,7 @@ def main():
 
             mymail.send_mail()
             del mymail
-    
+
 if __name__ == '__main__':
     sys.exit(main())