Fix: Wrong condition check of target_project

Change-Id: Ife810411253ab293698eb912f40d4fd7e0e849e8

diff --git a/job_submit_request_sync.py b/job_submit_request_sync.py
index 5a9dab0..5b76e22 100644 (file)
--- a/job_submit_request_sync.py
+++ b/job_submit_request_sync.py
@@ -110,24 +110,21 @@ def main():
 
     enabled_projects = ast.literal_eval(os.getenv('SR_SYNC_PROJECTS'))
 
+    target_project = None
     reason = 'SR-SYNC'
-    if os.getenv('TRIGGER_INFO', None):
+    if os.getenv('UPSTREAM_SNAPSHOT', None) and os.getenv('UPSTREAM_OBS_PROJECT', None):
+        snapshot = os.getenv('UPSTREAM_SNAPSHOT')
+        project = os.getenv('UPSTREAM_OBS_PROJECT')
+        #target_project = os.getenv('TARGET_PROJECT')
+        # Retrieve SR list of the snapshot from dashboard
+        official_data = request_sr_list_for_snapshot(project, snapshot, reason)
+    elif os.getenv('TRIGGER_INFO', None):
         manual_trigger = trigger_info(os.getenv('TRIGGER_INFO'))
         snapshot = 'SR-SYNC'
         project = manual_trigger.get('source')
         target_project = manual_trigger.get('target')
         # Parse triggered data
         official_data = touch_trigger_data(manual_trigger)
-    else:
-        snapshot = os.getenv('UPSTREAM_SNAPSHOT')
-        project = os.getenv('UPSTREAM_OBS_PROJECT')
-        target_project = os.getenv('TARGET_PROJECT')
-        # Retrieve SR list of the snapshot from dashboard
-        official_data = request_sr_list_for_snapshot(project, snapshot, reason)
-
-    if target_project != os.getenv('TARGET_PROJECT'):
-        print 'Skip target project %s' % target_project
-        return
 
     for source_project in enabled_projects.keys():
         if source_project != project:
@@ -135,7 +132,7 @@ def main():
             continue
         enabled_projects[source_project] = \
                      [ x for x in enabled_projects[source_project] \
-                       if x.get('target') == target_project ]
+                       if (not target_project or x.get('target') == target_project) ]
     print enabled_projects 
     if project not in enabled_projects:
         return
@@ -225,7 +222,6 @@ def main():
 
             bm_end_datetime = datetime.now()
             bm_sync_git_tag = project_to_create.split(':'+target['target']+':')[-1].replace(':','/')
-
             bm_stage = "Sync_SR_Submit"
             bm_data = {"bm_stage" : bm_stage,
                        "commit_date" : str(bm_end_datetime),