From f62e3cb18c56e1831983e1f9672bc99b8bfb0f17 Mon Sep 17 00:00:00 2001 From: ZhuoX Li Date: Wed, 5 Nov 2014 13:58:41 +0800 Subject: [PATCH] Add download url, obs url to meta Change-Id: If52205e06fd783debe3f780650d2ca3ddc26ffb3 Fixes: #1732 --- job_pre_release_obs.py | 14 ++++++++++---- job_submit.py | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py index f1d9dee..e4d89cb 100755 --- a/job_pre_release_obs.py +++ b/job_pre_release_obs.py @@ -99,7 +99,8 @@ def trigger_image_creation(images_ks, build_id, path_repo, trigger_next('%s/image_trigger_%s_%s' % (os.getenv('WORKSPACE'), repo_name, index), data) -def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base): +def make_repo(project, repo, backenddb, base_url, base_path, + live_repo_base, build): """ make repo. @@ -174,6 +175,12 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base): os.path.join(prerelease.dir, prerelease.build_id), project, base_url, repo['Name']) + # reset 'images' and add download_url meta info + build.update_info({'images': [], + 'download_url': os.path.join(base_url, + prerelease.dir, + prerelease.build_id)}, + project) @@ -268,9 +275,8 @@ def main(action): return 0 - make_repo(project, repo, backenddb, base_url, base_path, live_repo_base) - # reset 'images' meta info - build.update_info({'images': []}, project) + make_repo(project, repo, backenddb, base_url, base_path, + live_repo_base, build) elif action == 'cleanup': # request(SR) end of life, this founction should be called to # delete the prerelease project " diff --git a/job_submit.py b/job_submit.py index 4b49e64..c949e5d 100755 --- a/job_submit.py +++ b/job_submit.py @@ -83,6 +83,8 @@ def create_project(git_url, git_project, git_tag, git_revision, build, 'obs_target_prj': obs_target_prj, 'git_tag': git_tag, 'git_commit': git_revision, + 'obs_url': os.path.join(os.getenv('OBS_URL'), \ + 'project/show?project=%s' % obs_project), 'images': []} if submitter: info['submitter'] = escape(submitter) -- 2.7.4