Fix the prerelease repo inconsistent with new repo structure issues

Fixes: #1658

Change-Id: If66d81ec1ceeebd4438c20c9251be5fc73d56892
Signed-off-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/common/snapshot.py b/common/snapshot.py
index b839544..eef5aa6 100644 (file)
--- a/common/snapshot.py
+++ b/common/snapshot.py
@@ -50,7 +50,7 @@ class Prerelease(object):
             pkg_urls[arch] = os.path.join(self.base_url, self.dir,
                                           self.build_id, 'repos',
                                           self.snapshot.repo['Target'],
-                                          ARCH_MAP.get(arch, arch), 'packages')
+                                          'packages')
         return pkg_urls
 
 

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index fa59bae..17621f8 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -111,7 +111,8 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base):
         raise LocalError("Error getting prerelease info: %s" % str(err))
 
     # Convert live repo to download structure
-    repomaker = RepoMaker(prerelease.build_id, prerelease.path)
+    repomaker = RepoMaker(prerelease.build_id, os.path.join(prerelease.path,
+                                                            prerelease.build_id))
     live_repo_path = os.path.join(live_repo_base,
                                   project.replace(':', ':/'))