From: Yonghee Han Date: Tue, 25 Oct 2016 04:13:02 +0000 (+0900) Subject: REPO_PUBLISHED event is generated only once when all repos are published. Delete... X-Git-Tag: submit/trunk/20190927.012743~574^2~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F93571%2F1;p=services%2Fjenkins-scripts.git REPO_PUBLISHED event is generated only once when all repos are published. Delete chksnap option on prerelease project Change-Id: Iecc5e89b4b7addebf956c3a3c2be4dded9d30392 --- diff --git a/job_jobs_dispatcher.py b/job_jobs_dispatcher.py index 7b3af61..2059440 100755 --- a/job_jobs_dispatcher.py +++ b/job_jobs_dispatcher.py @@ -31,14 +31,6 @@ from common.snapshot import snapshot_project_enabled from common.prerelease import is_prerelease_project def isReadyForPrerelease(build, project): - # whether Prerelease project is not enabled - repo_status = build.get_repo_state_summary(project) - for target_arch, status in repo_status.items(): - if status not in ['published', 'unpublished']: - print "Skipping prerelease repository creation as OBS "\ - "repository: %s/%s is still under %s, skip now." \ - % (project,target_arch, status) - return False return True def isReadyForCreateSnapshot(build, backenddb, project): @@ -48,15 +40,6 @@ def isReadyForCreateSnapshot(build, backenddb, project): print "Skipping creating snapshot, project isn't found in repo.yaml" return False - # Check whether all the repos published, we skip it if any one of - # them not published - repo_status = build.get_repo_state_summary(project) - for target_arch, status in repo_status.items(): - if status not in ['published', 'unpublished']: - print "The project: %s target: %s repo is still under %s, " \ - "skip creating snapshot now" % (project, target_arch, status) - return False - return True def main(obs_event_fields): diff --git a/job_post_image.py b/job_post_image.py index 45d4c41..f100565 100755 --- a/job_post_image.py +++ b/job_post_image.py @@ -64,17 +64,5 @@ def main(): } build.update_info(info, project) - saveinfo = build.get_info(project) - try: - #print "images count : %s %s \n" % ( len(saveinfo['images']), saveinfo['images_count']) - #if len(saveinfo['images']) == saveinfo['images_count']: - if (saveinfo['chksnap'] == '1'): - # clear chksnap flag - info['chksnap'] = '0' - build.update_info(info, project) - - except: - print 'exception images_count' - if __name__ == "__main__": sys.exit(main()) diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py index 6ea337e..243acef 100755 --- a/job_pre_release_obs.py +++ b/job_pre_release_obs.py @@ -311,16 +311,6 @@ def main(action): if action == 'create_images': repo = content.get("repo") - info = build.get_info(project) - try: - if (info['chksnap'] == '1'): - print "Already created snapshot....." - return 0 - elif (info['chksnap'] == '0'): - build.update_info({'chksnap': '1'}, project) - print "create snapshot." - except: - build.update_info({'chksnap': '1'}, project) # cleanup src.rpm files on Live repo # we don't used src.rpm files on prerelease project. diff --git a/job_submit.py b/job_submit.py index 1bcd8b9..ec35734 100755 --- a/job_submit.py +++ b/job_submit.py @@ -356,7 +356,6 @@ def create_project(git_url, git_project, git_tag, git_revision, build, 'git_commit': git_revision, 'obs_url': os.path.join(os.getenv('OBS_URL'), \ 'project/show?project=%s' % obs_project), - 'chksnap' : '0', 'images': []} if build.exists(obs_project):