From: Ed Bartosh Date: Sun, 4 May 2014 19:55:46 +0000 (+0300) Subject: Pylinted job_pre_release_obs X-Git-Tag: 1.0~145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a667e87fc8a1daa6ded041a0d8a98cb4530c34e6;p=services%2Fjenkins-scripts.git Pylinted job_pre_release_obs Change-Id: I6f63f0abfd60f1f4b2ac30fa5f3732e6ccf0d4f9 Signed-off-by: Ed Bartosh --- diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py index 94f36d1..3d64f53 100755 --- a/job_pre_release_obs.py +++ b/job_pre_release_obs.py @@ -22,7 +22,7 @@ class LocalError(Exception): """Local error exception.""" pass -def update_ks(imagedata, snapshot_id, pkg_urls, repo_name): +def update_ks(imagedata, snapshot_id, pkg_urls): """ update the repo url point to right URL and add prerelease repo url with highest priority @@ -82,8 +82,8 @@ def trigger_image_creation(images_ks, build_id, path_repo, 'repo': repo_name, 'url_pub_base': url_pub_base } - trigger_next('%s/image_trigger_%s_%s' % (os.getenv('WORKSPACE'), repo_name, index), - data) + 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): """ @@ -116,20 +116,24 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base): targets = snapshot.targets for repo in targets: - repomaker = RepoMaker(prerelease.build_id, os.path.join(prerelease.path, - prerelease.build_id)) + repomaker = RepoMaker(prerelease.build_id, + os.path.join(prerelease.path, + prerelease.build_id)) try: - repomaker.add_repo(live_repo_path, repo['Name'], repo['Architectures'], move=False) + repomaker.add_repo(live_repo_path, repo['Name'], + repo['Architectures'], move=False) except RepoMakerError, err: raise LocalError("Unable to create download repo: %s" % err) - # Assuming that there can be just one image-configurations- rpm in the repo + # Assuming that there can be just one image-configurations- + # rpm in the repo if not repomaker.has_images(): # repomaker did not found image-configurations in pre_release repo, # 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', repo['Name']), + img_conf = find_files(os.path.join(snapshot.path, 'repos', + repo['Name']), prefix="image-configurations-", suffix='noarch.rpm') img_conf_list = list(img_conf) @@ -146,14 +150,15 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base): # Update ks files images_ks = update_ks(repomaker.imagedata, snapshot.build_id, - prerelease.pkg_urls(repo['Name']), repo['Name']) + prerelease.pkg_urls(repo['Name'])) # Generate image info to builddata/ dir repomaker.gen_image_info(images_ks) # trigger image creation jobs trigger_image_creation(images_ks, prerelease.build_id, - os.path.join(prerelease.dir, prerelease.build_id), + os.path.join(prerelease.dir, + prerelease.build_id), project, base_url, repo['Name'])