yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openqa-comments: replace custom comment marker with standard, simplify and correct comment logic.

Browse Source
This commit is contained in:
Jimmy Berry 2018-11-09 15:56:54 -06:00
parent 89174c9e0f
commit 8272c18dcf
1 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
openqa-comments.py
View File

@ -13,6 +13,7 @@ import osc
MARGIN_HOURS = 4 MARGIN_HOURS = 4
MAX_LINES = 6 MAX_LINES = 6
MARKER = 'openQA'
class OpenQAReport(object): class OpenQAReport(object):
@ -34,35 +35,20 @@ class OpenQAReport(object):
safe_margin = timedelta(hours=MARGIN_HOURS) safe_margin = timedelta(hours=MARGIN_HOURS)
return safe_margin <= time_delta return safe_margin <= time_delta
def is_there_openqa_comment(self, project): def update_status_comment(self, project, report, force=False, only_replace=False):
"""Return True if there is a previous comment.""" report = self.comment.add_marker(report, MARKER)
signature = '<!-- openQA status -->'
comments = self.comment.get_comments(project_name=project) comments = self.comment.get_comments(project_name=project)
comment = [c for c in comments.values() if signature in c['comment']] comment, _ = self.comment.comment_find(comments, MARKER)
return len(comment) > 0 if comment:
write_comment = (report != comment['comment'] and self.old_enough(comment['when']))
def update_status_comment(self, project, report, force=False): else:
signature = '<!-- openQA status -->' write_comment = not only_replace
report = '%s\n%s' % (signature, str(report))
write_comment = False
comments = self.comment.get_comments(project_name=project)
comment = [c for c in comments.values() if signature in c['comment']]
if comment and len(comment) > 1:
print 'ERROR. There are more than one openQA status comment in %s' % project
# for c in comment:
# self.comment.delete(c['id'])
# write_comment = True
elif comment and comment[0]['comment'] != report and self.old_enough(comment[0]['when']):
self.comment.delete(comment[0]['id'])
write_comment = True
elif not comment:
write_comment = True
if write_comment or force: if write_comment or force:
if osc.conf.config['debug']: if osc.conf.config['debug']:
print 'Updating comment' print 'Updating comment'
if comment:
self.comment.delete(comment['id'])
self.comment.add_comment(project_name=project, comment=report) self.comment.add_comment(project_name=project, comment=report)
def _report_broken_packages(self, info): def _report_broken_packages(self, info):
@ -108,7 +94,7 @@ class OpenQAReport(object):
return '\n'.join(lines).strip(), failure return '\n'.join(lines).strip(), failure
def report(self, project, aggregate=True): def report(self, project, aggregate=True, force=False):
info = self.api.project_status(project, aggregate) info = self.api.project_status(project, aggregate)
# Some staging projects do not have info like # Some staging projects do not have info like
@ -134,19 +120,17 @@ class OpenQAReport(object):
report_checks = 'Checks:\n\n' + report_checks report_checks = 'Checks:\n\n' + report_checks
report = '\n\n'.join((report_broken_packages, report_checks)) report = '\n\n'.join((report_broken_packages, report_checks))
report = report.strip() report = report.strip()
if report: only_replace = False
if osc.conf.config['debug']: else:
print project report = 'Congratulations! All fine now.'
print '-' * len(project) only_replace = True
print report
self.update_status_comment(project, report) self.update_status_comment(project, report, force=force, only_replace=only_replace)
elif not info['overall_state'] == 'acceptable' and self.is_there_openqa_comment(project):
report = 'Congratulations! All fine now.' if osc.conf.config['debug']:
if osc.conf.config['debug']: print project
print project print '-' * len(project)
print '-' * len(project) print report
print report
self.update_status_comment(project, report, force=True)
if __name__ == '__main__': if __name__ == '__main__':
@ -166,16 +150,13 @@ if __name__ == '__main__':
osc.conf.get_config() osc.conf.get_config()
osc.conf.config['debug'] = args.debug osc.conf.config['debug'] = args.debug
if args.force:
MARGIN_HOURS = 0
apiurl = osc.conf.config['apiurl'] apiurl = osc.conf.config['apiurl']
Config(apiurl, args.project) Config(apiurl, args.project)
api = StagingAPI(apiurl, args.project) api = StagingAPI(apiurl, args.project)
openQA = OpenQAReport(api) openQA = OpenQAReport(api)
if args.staging: if args.staging:
openQA.report(api.prj_from_letter(args.staging), False) openQA.report(api.prj_from_letter(args.staging), False, args.force)
else: else:
for staging in api.get_staging_projects(): for staging in api.get_staging_projects():
openQA.report(staging) openQA.report(staging, True, args.force)