Differential D850

don't repeat information in CheckDetail.note
ClosedPublic
Actions

Authored by kparal on May 13 2016, 1:30 PM.

Details

Reviewers
mkrizek
jskladan
Group Reviewers
libtaskotron
Commits
rUPGRf5e4a20b6b9e: don't repeat information in CheckDetail.note
Summary

Only print relevant information into resultyaml's note. For koji
build, this removes item, leaves kojitag. For update update, this
adds kojitag to have it consistent.

Koji build before:

note: chirp-20160504-1.fc23 into f23-updates

and now:

note: f23-updates

Bodhi update before:

note: 1 PASSED, 1 FAILED

and now:

note: 1 PASSED, 1 FAILED; f23-updates

This is slightly relevant to T794.

Test Plan

tested locally

Diff Detail

Repository
rUPGR task-upgradepath
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to don't repeat information in CheckDetail.note.May 13 2016, 1:30 PM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added a reviewer: libtaskotron.
jskladan accepted this revision.May 13 2016, 1:51 PM
jskladan added a reviewer: jskladan.
This revision is now accepted and ready to land.May 13 2016, 1:51 PM
mkrizek accepted this revision.May 13 2016, 1:52 PM
mkrizek added a reviewer: mkrizek.
Closed by commit rUPGRf5e4a20b6b9e: don't repeat information in CheckDetail.note (authored by kparal). · Explain WhyMay 13 2016, 2:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mupgradepath.py (6 lines)

Diff 2186

View Options

upgradepath.py

Show First 20 Lines • Show All 437 Lines • ▼ Show 20 Line(s)437 for (nevr, koji_build) in zip(nevrs, koji_builds):
438 logger.debug('Checking: %s', nevr) 438​ logger.debug('Checking: %s', nevr)
439 439​
440 # Populate self.build2detail: 440​ # Populate self.build2detail:
441 # {build NVR: CheckDetail} 441​ # {build NVR: CheckDetail}
442 detail = check.CheckDetail(item=nevr, 442​ detail = check.CheckDetail(item=nevr,
443 report_type=check.ReportType.KOJI_BUILD) 443​ report_type=check.ReportType.KOJI_BUILD)
444 self.build2detail[nevr] = detail 444​ self.build2detail[nevr] = detail
445 445​
446 detail.note = '%s into %s' % (nevr, kojitag) 446​ detail.note = kojitag
447 detail.store('%s\n%s\n%s' % (60*'=', detail.note, 60*'=')) 447​ detail.store('%s\n%s into %s\n%s' % (60*'=', nevr, kojitag, 60*'='))
448 448​
449 # Koji returns list if the call succeeded and dict (containing error 449​ # Koji returns list if the call succeeded and dict (containing error
450 # information) if the call failed 450​ # information) if the call failed
451 if isinstance(koji_build, dict): 451​ if isinstance(koji_build, dict):
452 msg = "Can't fetch info about %s from Koji: %s" % (nevr, koji_build) 452​ msg = "Can't fetch info about %s from Koji: %s" % (nevr, koji_build)
453 detail.store(msg) 453​ detail.store(msg)
454 self.problematic[nevr] = msg 454​ self.problematic[nevr] = msg
455 detail.outcome = 'ABORTED' 455​ detail.outcome = 'ABORTED'
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Line(s)569 for build, update in sorted(build2update.iteritems(), key=lambda t: t[0]):
576 build_detail = self.build2detail[build] 576​ build_detail = self.build2detail[build]
577 update_detail.update_outcome(build_detail.outcome) 577​ update_detail.update_outcome(build_detail.outcome)
578 update_detail.output.extend(build_detail.output) 578​ update_detail.output.extend(build_detail.output)
579 579​
580 for update, detail in self.update2detail.iteritems(): 580​ for update, detail in self.update2detail.iteritems():
581 builds = [b for b, u in build2update.iteritems() if u is update] 581​ builds = [b for b, u in build2update.iteritems() if u is update]
582 bdetails = [d for b, d in self.build2detail.iteritems() if b in builds] 582​ bdetails = [d for b, d in self.build2detail.iteritems() if b in builds]
583 summary = check.CheckDetail.create_multi_item_summary(bdetails) 583​ summary = check.CheckDetail.create_multi_item_summary(bdetails)
584 detail.note = summary 584​ detail.note = '%s; %s' % (summary, kojitag)
585 detail.store('\nSUMMARY: %s' % summary, printout=False) 585​ detail.store('\nSUMMARY: %s' % summary, printout=False)
586 586​
587 # save logs if requested 587​ # save logs if requested
588 self.store_logs() 588​ self.store_logs()
589 589​
590 # report results 590​ # report results
591 build_details = sorted(self.build2detail.values(), key=lambda d: d.item) 591​ build_details = sorted(self.build2detail.values(), key=lambda d: d.item)
592 update_details = sorted(self.update2detail.values(), key=lambda d: d.item) 592​ update_details = sorted(self.update2detail.values(), key=lambda d: d.item)
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines