From 6e9c7af53faf7361f8883e7e645e2e9b7c776302 Mon Sep 17 00:00:00 2001
From: Yonghee Han <onstudy@samsung.com>
Date: Fri, 9 Jun 2017 15:00:52 +0900
Subject: [PATCH] Change the snapshot path to use the reference snapshot must
 be used the reference buildid

Change-Id: I592145064f01a5301ca5e940de2d3e554f652fdc
---
 common/snapshot.py     | 14 ++++++++++++++
 job_pre_release_obs.py |  7 +++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/snapshot.py b/common/snapshot.py
index 4fc1d3b..dff2a8e 100644
--- a/common/snapshot.py
+++ b/common/snapshot.py
@@ -72,6 +72,20 @@ class Prerelease(object):
         """Prerelease path."""
         return os.path.join(self.snapshot.base_path, self.dir)
 
+    @property
+    def snapshot_path(self):
+        """Prerelease snapshot path."""
+        if self.buildid:
+            """Snapshot path."""
+            return os.path.join(self.snapshot.base_path,
+                                self.snapshot.repo['SnapshotDir'],
+                                self.buildid)
+        else:
+            """Snapshot path."""
+            return os.path.join(self.snapshot.base_path,
+                                self.snapshot.repo['SnapshotDir'],
+                                self.snapshot.build_id)
+
     def pkg_urls(self, repo):
         """List of package(repository) urls for prerelease."""
         pkg_urls = {}
diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index 7187bfe..0e1b392 100755
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -179,8 +179,10 @@ def make_repo(project, repo, backenddb, base_url, base_path,
         # Set obs_target_prj to ref project if it is enabled
         if os.getenv("REF_CREATE_PRJ_OBS_ENABLE","0") == "1" and basebuildid:
             prerelease = snapshot.get_prerelease(base_url, tstamp, basebuildid)
+            snapshot_path = prerelease.snapshot_path
         else:
             prerelease = snapshot.get_prerelease(base_url, tstamp)
+            snapshot_path = snapshot.path
     except SnapshotError, err:
         raise LocalError("Error getting prerelease info: %s" % str(err))
 
@@ -188,6 +190,7 @@ def make_repo(project, repo, backenddb, base_url, base_path,
     live_repo_path = os.path.join(live_repo_base,
                                   project.replace(':', ':/'))
     targets = snapshot.targets
+    print 'snapshot-path : %s ' %(snapshot_path)
 
     # Cleanup repo directory
     if os.path.isdir(os.path.join(prerelease.path, prerelease.build_id)):
@@ -225,7 +228,7 @@ def make_repo(project, repo, backenddb, base_url, base_path,
             # let's take it from target repo, only one package repo is enough
 
             # Add image configuration to prerelease repo
-            img_conf = find_files(os.path.join(snapshot.path, 'repos',
+            img_conf = find_files(os.path.join(snapshot_path, 'repos',
                                                repo['Name']),
                                   prefix="image-configurations-",
                                   suffix='noarch.rpm')
@@ -244,7 +247,7 @@ def make_repo(project, repo, backenddb, base_url, base_path,
 
                 #raise LocalError("Image configuration not found in %s" %
                 #        snapshot.path)
-                print "Image configuration not found in %s, repo:%s" %(snapshot.path, repo['Name'])
+                print "Image configuration not found in %s, repo:%s" %(snapshot_path, repo['Name'])
                 continue
 
             for rpm in img_conf_list:
-- 
2.7.4