Fix a bug in submit_request_git_sync
authorYonghee Han <onstudy@samsung.com>
Wed, 30 May 2018 02:15:26 +0000 (11:15 +0900)
committerYonghee Han <onstudy@samsung.com>
Thu, 31 Jan 2019 01:21:23 +0000 (10:21 +0900)
Add a sync_user e-mail

Change-Id: I826ab00bf43bcbe5e2df6b241e3e1ae5b9e15019

job_submit_request_git_sync.py

index 63893cf..839aa88 100644 (file)
@@ -97,7 +97,7 @@ def conv_rev2commit(gitprj, git_dir, revision):
         print 'Error:', exc
     return commit
 
-def update_sync_for_git_sync(tmpdir, private_gerrit, target, requests, request_snapshot):
+def update_sync_for_git_sync(tmpdir, private_gerrit, target, requests, request_snapshot, sync_user=None):
     """
     Update sync for git sync.
     """
@@ -114,8 +114,8 @@ def update_sync_for_git_sync(tmpdir, private_gerrit, target, requests, request_s
     UPSTREAM_BRANCH = "public_" + target.get('source_branch') or []
     tagname = get_tagname_from_prerelease_name(requests.keys()[0])
     email_to_submitters = []
-    if target.get('sync_user'):
-        email_to_submitters.append(target.get('sync_user'))
+    if sync_user:
+        email_to_submitters.append(sync_user)
 
     request_projects = []
     new_private_projects = []
@@ -456,7 +456,7 @@ def main():
     for target in enabled_projects[content.get('obs_target_prj')]:
         if target.get('git-sync') == 'Yes' and target.get('target') == content.get('obs_dest_prj'):
             tmpdir = tempfile.mkdtemp(prefix=os.getenv('WORKSPACE')+'/')
-            update_sync_for_git_sync(tmpdir, private_gerrit, target, content['requests'][0], content['snapshot'])
+            update_sync_for_git_sync(tmpdir, private_gerrit, target, content['requests'][0], content['snapshot'], content.get('sync_user'))
         else:
             print 'obs_dest_prj: %s project : git-sync option is not enabled..' %(target.get('target'))