From eaeae6127a982ef34e13d1006b60df36194b921a Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 3 Jun 2013 16:44:02 +0300 Subject: [PATCH] job_pre_release_obs: code cleanup cleaned up and restructured the code of job_pre_release_obs Change-Id: Icd8e087505850942d8d58fe5ca6cafdf52576087 Signed-off-by: Ed Bartosh --- job_pre_release_obs.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py index 1fdc7e2..f47426e 100755 --- a/job_pre_release_obs.py +++ b/job_pre_release_obs.py @@ -85,8 +85,8 @@ def make_repo(project, repo, backenddb): """ # Make build id from latest snapshot + project suffix + target_project = project.split(':')[:-1][3:] try: - target_project = project.split(':')[:-1][3:] data = backenddb.get_repo_data(target_project) except BackendDBError, err: raise LocalError("Can't get information about project '%s': %s" \ @@ -111,8 +111,6 @@ def make_repo(project, repo, backenddb): except RepoMakerError, err: raise LocalError("Unable to create download repo: %s" % err) - # TODO: remove output_dir - # Assuming that there can be just one image-configurations- rpm in the repo if not repomaker.imagedata: # repomaker did not found image-configurations in pre_release repo, @@ -153,22 +151,18 @@ def main(name, action): obs_user = os.getenv("OBS_API_USERNAME") obs_passwd = os.getenv("OBS_API_PASSWD") content = trigger_info(os.getenv("TRIGGER_INFO")) - #obs_target_prj = content.get('OBS_REQ_PRJ') project = content.get("project") - build = BuildService(obs_api, obs_user, obs_passwd) - - # Init backend database - redis_host = os.getenv("REDIS_HOST") - redis_port = os.getenv("REDIS_PORT") - backenddb = BackendDB(redis_host, redis_port) if action == 'create_images': + # Init backend database + redis_host = os.getenv("REDIS_HOST") + redis_port = os.getenv("REDIS_PORT") + backenddb = BackendDB(redis_host, redis_port) repo = content.get("repo") make_repo(project, repo, backenddb) - # TODO: sync_repo(output_dir) - elif action == 'cleanup': + build = BuildService(obs_api, obs_user, obs_passwd) build.cleanup(project, "Cleaned up by %s" % name) else: raise LocalError("Not supported method of pre_release_obs job: %s" \ -- 2.7.4