TPE-190 Register _tpk branch to test trigger info

Problem: tpk branch naming was changed to use profile name inside it.
Fix: Filter required profile names from environment variable.

Change-Id: Ifb8bcc7a17468dbb7037a2f0399b2aa1061160ec

diff --git a/job_submit.py b/job_submit.py
index 389a8d3..747048d 100644 (file)
--- a/job_submit.py
+++ b/job_submit.py
@@ -370,9 +370,13 @@ def main(build_type, build, event, sr_count):
 
     # get project mappings from git-obs-mapping and git-ref-mapping
     if git_branch.endswith('_tpk'): # ABS - mappings w/o _tpk postfix(only for profiles).
-        obs_target_prjs = git_obs_map(event['project'], git_branch.split('_tpk')[0])
+        work_branch = git_branch
+        if os.getenv('ABS_SUPPORTED_PROFILES', None):
+            for sp in os.getenv('ABS_SUPPORTED_PROFILES').split(','):
+                work_branch = work_branch.replace('_%s_tpk' % sp.lower(), '')
+        obs_target_prjs = git_obs_map(event['project'], work_branch)
         if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1":
-            obs_ref_prjs = get_ref_map(event['project'], git_branch.split('_tpk')[0])
+            obs_ref_prjs = get_ref_map(event['project'], work_branch)
     else:
         obs_target_prjs = git_obs_map(event['project'], git_branch)
         if os.getenv("REF_USE_FOR_PRERELEASE","0") == "1":

diff --git a/job_test_trigger_info_update.py b/job_test_trigger_info_update.py
index ddbd572..1aaa195 100644 (file)
--- a/job_test_trigger_info_update.py
+++ b/job_test_trigger_info_update.py
@@ -130,7 +130,10 @@ def main():
 
     #TODO: tizen_{profile}_tpk branch hack
     if branch.endswith('_tpk'):
-        branch = branch.split('_%s_tpk' % target_project.split(':')[-1].lower())[0]
+        if os.getenv('ABS_SUPPORTED_PROFILES', None):
+            for sp in os.getenv('ABS_SUPPORTED_PROFILES').split(','):
+                branch = branch.replace('_%s_tpk' % sp.lower(), '')
+        #branch = branch.split('_%s_tpk' % target_project.split(':')[-1].lower())[0]
     print 'We have [%s] [%s]' % (target_project, branch)
 
     prjdir = os.path.join(os.getenv('WORKSPACE'), \
@@ -150,7 +153,10 @@ def main():
         args = GitArgs('--orphan', branch)
         mygit._git_command('checkout', args.args)
         args = GitArgs('-rf', '.')
-        mygit._git_command('rm', args.args)
+        try:
+            mygit._git_command('rm', args.args)
+        except Exception as err:
+            print repr(err)
     if os.path.exists(os.path.join(prjdir, GIT_FILE_NAME)):
         mygit.remove_files(GIT_FILE_NAME)
     with open(os.path.join(prjdir, GIT_FILE_NAME), 'w') as mf: