From: Hasan Wan <hasan.wan@intel.com>
Date: Mon, 1 Jul 2013 07:11:44 +0000 (+0800)
Subject: fix several errors to make prerelease process work again
X-Git-Tag: 0.14~104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dae5c4cdd1fbc0b994d758de685ad80028c2c864;p=services%2Fjenkins-scripts.git

fix several errors to make prerelease process work again

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

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index b12fba3..faf3658 100755
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -65,7 +65,7 @@ def get_prerelease_data(backenddb, base_url, base_path='/srv/download',
     pkg_urls = {}
     for arch in repo['Architectures']:
         pkg_urls[arch] = os.path.join(base_url, prerelease_dir, build_id,
-                                      'repos', repo,
+                                      'repos', repo['Target'],
                                       archmap.get(arch, arch), 'packages')
 
     return {'snapshot_path': os.path.join(base_path, snapshot_dir),
@@ -94,7 +94,7 @@ def update_ks(imagedata, backenddb, info, base_url):
                           "--ssl_verify=no --priority 1" % url
     images_ks = {}
     # update ULRs in ks file
-    for name, content in imagedata.ks.items():
+    for name, content in imagedata.ksi.items():
         new_ks_lines = []
         for line in content.splitlines():
             if line.startswith('repo ') and \
@@ -137,7 +137,7 @@ def trigger_image_creation(images_ks, build_id, path_repo):
         trigger_next('%s/image_trigger_%s' % (os.getenv('WORKSPACE'), index),
                      data)
 
-def make_repo(project, repo, backenddb, base_url, base_path):
+def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base):
     """
     make repo.
 
@@ -162,7 +162,9 @@ def make_repo(project, repo, backenddb, base_url, base_path):
     # Convert live repo to download structure
     build_id = data['prerelease_build_id']
     repomaker = RepoMaker(build_id, prerelease_path)
-    live_repo_path = os.path.join(prerelease_path, project.replace(':', ':/'))
+    live_repo_path = os.path.join(live_repo_base,
+                                  project.replace(':', ':/'))
+
     # TODO: get buldconf from OBS
     try:
         repomaker.add_repo(live_repo_path, repo, move=False) #,buildconf
@@ -221,6 +223,7 @@ def main(name, action):
     obs_passwd = os.getenv("OBS_API_PASSWD")
     base_url = os.getenv("URL_PUBLIC_REPO_BASE")
     base_path = os.getenv('PATH_REPO_BASE')
+    live_repo_base = os.getenv('PATH_LIVE_REPO_BASE')
 
     content = trigger_info(os.getenv("TRIGGER_INFO"))
 
@@ -246,7 +249,7 @@ def main(name, action):
 
                 return True
 
-        make_repo(project, repo, backenddb, base_url, base_path)
+        make_repo(project, repo, backenddb, base_url, base_path, live_repo_base)
     elif action == 'cleanup':
         # request(SR) end of life, this founction should be called to
         # delete the pre-release project "