Move git-obs-mapping parsing to default one

Because the multiply mapping files support is not needed in near future, remove
that part and still parse git-obs-mapping from the default directory
{git_cache}/scm/git-obs-mapping.

Fixes: #1035

Change-Id: Id0ae32367184d404607658bbde1aae3932bfa608
Signed-off-by: Lin Yang <lin.a.yang@intel.com>
Reviewed-on: https://otctools.jf.intel.com/review/6086
Tested-by: OTC Tools Tester <ed.bartosh@linux.intel.com>
Reviewed-by: Eduard Bartosh <eduard.bartosh@intel.com>

diff --git a/job_pre_release_gerrit.py b/job_pre_release_gerrit.py
index 1b4a526..30d39fb 100755 (executable)
--- a/job_pre_release_gerrit.py
+++ b/job_pre_release_gerrit.py
@@ -28,27 +28,22 @@ def git_obs_map(gerrit_prj, gerrit_branch):
     by parsing git-obs-mapping.xml.
     """
     git_cache = os.getenv("GIT_CACHE_DIR")
-    mapping_prjs = os.getenv("MAPPING_PROJECTS")
-    for mapping_prj in mapping_prjs.split(';'):
-        mapping_prj = mapping_prj.strip()
-        host, path = mapping_prj.split('/', 1)
-        print 'Checking %s mapping...' % mapping_prj
-        clone_dir = os.path.join(git_cache, mapping_prj)
-        mapping_path = os.path.join(clone_dir, "git-obs-mapping.xml")
-        print 'mapping_path:', mapping_path
-        if not os.path.isfile(mapping_path):
-            print 'Cloning %s' % mapping_prj
-            if not clone_gitproject(path, clone_dir, host):
-                raise LocalError('Error cloning %s' % mapping_prj)
-        if not os.path.isfile(mapping_path):
-            raise LocalError('Error: Mapping file is not fetched')
-
-        # get mapping
-        mymapping = mapping.Mapping(mapping_path)
-        obs_prjs = mymapping.get_submit_mapping(gerrit_prj, gerrit_branch)
-        if obs_prjs:
-            print 'Found git-obs-mapping: %s -> %s' % (gerrit_prj, obs_prjs)
-            return obs_prjs
+    mapping_prj = os.getenv("MAPPING_PRJ")
+    mapping_path = '%s/git-obs-mapping.xml' % \
+                       os.path.join(git_cache, mapping_prj)
+
+    if not os.path.isfile(mapping_path):
+        print 'Cloning %s' % mapping_prj
+        if not clone_gitproject(mapping_prj, \
+                os.path.join(git_cache, mapping_prj)):
+            raise LocalError('Error cloning %s' % mapping_prj)
+
+    # get mapping
+    mymapping = mapping.Mapping(mapping_path)
+    obs_prjs = mymapping.get_submit_mapping(gerrit_prj, gerrit_branch)
+    if obs_prjs:
+        print 'Found git-obs-mapping: %s -> %s' % (gerrit_prj, obs_prjs)
+        return obs_prjs
 
     raise LocalError('Not found git-obs-mapping for %s branch %s' % \
                      (gerrit_prj, gerrit_branch))