Differential D322

Report per-build and per-update
ClosedPublic
Actions

Authored by jskladan on Apr 1 2015, 3:51 PM.

Details

Reviewers
kparal
tflink
Maniphest Tasks
T388: Alter depcheck to report results per-package instead of per-update
Commits
rDEPCKfdc09c5b35ac: Report per-build and per-update
Summary

It is now possible to report per-build and/or per-update

Test Plan

Tested locally with runtask, unittests work

Diff Detail

Repository
rDEPCK task-depcheck
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
jskladan retitled this revision from to Report per-build and per-update.Apr 1 2015, 3:51 PM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: tflink, kparal.
kparal accepted this revision.Apr 2 2015, 8:03 AM

Great!

This revision is now accepted and ready to land.Apr 2 2015, 8:03 AM
Closed by commit rDEPCKfdc09c5b35ac: Report per-build and per-update (authored by Josef Skladanka <jskladan@redhat.com>). · Explain WhyApr 7 2015, 1:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mdepcheck.yml (4 lines)
Mdepcheck/squash_results.py (35 lines)

Diff 893

View Options

depcheck.yml

Show All 36 Lines36 - name: run depcheck
37 python: 37​ python:
38 file: run_depcheck.py 38​ file: run_depcheck.py
39 callable: taskotron_run 39​ callable: taskotron_run
40 arch: ['i386'] 40​ arch: ['i386']
41 rpms: ["${workdir}/downloaded_tag/"] 41​ rpms: ["${workdir}/downloaded_tag/"]
42 repos: 42​ repos:
43 - ${yumrepos_i386} 43​ - ${yumrepos_i386}
44 - "workdir_repo": "${workdir}/downloaded_tag/" 44​ - "workdir_repo": "${workdir}/downloaded_tag/"
45 report_format: "updates" 45​ report_format: "builds+updates"
46 workdir: "${workdir}" 46​ workdir: "${workdir}"
47 export: depcheck_output_i386 47​ export: depcheck_output_i386
48 48​
49 - name: download koji tag 49​ - name: download koji tag
50 koji: 50​ koji:
51 action: download_tag 51​ action: download_tag
52 koji_tag: ${koji_tag} 52​ koji_tag: ${koji_tag}
53 arch: ['x86_64'] 53​ arch: ['x86_64']
Show All 16 Lines69 - name: run depcheck
70 python: 70​ python:
71 file: run_depcheck.py 71​ file: run_depcheck.py
72 callable: taskotron_run 72​ callable: taskotron_run
73 arch: ['x86_64'] 73​ arch: ['x86_64']
74 rpms: ["${workdir}/downloaded_tag/"] 74​ rpms: ["${workdir}/downloaded_tag/"]
75 repos: 75​ repos:
76 - ${yumrepos_x86_64} 76​ - ${yumrepos_x86_64}
77 - "workdir_repo": "${workdir}/downloaded_tag/" 77​ - "workdir_repo": "${workdir}/downloaded_tag/"
78 report_format: "updates" 78​ report_format: "builds+updates"
79 workdir: "${workdir}" 79​ workdir: "${workdir}"
80 export: depcheck_output_x86_64 80​ export: depcheck_output_x86_64
81 81​
82 82​
83 # Report Results 83​ # Report Results
84 - name: report i386 results to resultsdb 84​ - name: report i386 results to resultsdb
85 resultsdb: 85​ resultsdb:
86 results: ${depcheck_output_i386} 86​ results: ${depcheck_output_i386}
Show All 18 Lines
View Options

depcheck/squash_results.py

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s)
114 114​
115def squash_results(run_result, bodhi_client = None, koji_client = None): 115​def squash_results(run_result, bodhi_client = None, koji_client = None):
116 per_nvr = _squash_rpms_to_builds(run_result, koji_client) 116​ per_nvr = _squash_rpms_to_builds(run_result, koji_client)
117 per_update = _squash_builds_to_updates(per_nvr, bodhi_client) 117​ per_update = _squash_builds_to_updates(per_nvr, bodhi_client)
118 118​
119 return per_update 119​ return per_update
120 120​
121def format_output(run_result, arch, report_format="rpms"): 121​def format_output(run_result, arch, report_format="rpms"):
122 if report_format == 'updates': 122​ if not run_result:
123 if run_result: 123​ return check.export_TAP([])
124 # remove the arch conversion to be consistent with cmdline arch 124​
125 if arch == 'i686': 125​ if 'updates' or 'builds' in report_format:
126 arch = 'i386' 126​ results = []
127 results = squash_results(run_result) 127​
128 for result in results: 128​ build_results = _squash_rpms_to_builds(run_result)
129 result.keyvals['arch'] = arch 129​ if 'builds' in report_format:
130 output = check.export_TAP(results, checkname='depcheck') 130​ for name, status in build_results.iteritems():
131 else: 131​ cd = check.CheckDetail(name, check.ReportType.KOJI_BUILD, status['result'])
132 output = check.export_TAP([]) 132​ cd.output.extend(status['details'])
133​ results.append(cd)
134​
135​ if 'updates' in report_format:
136​ update_results = _squash_builds_to_updates(build_results)
137​ results.extend(update_results)
138​
139​ # remove the arch conversion to be consistent with cmdline arch
140​ if arch == 'i686':
141​ arch = 'i386'
142​ for result in results:
143​ result.keyvals['arch'] = arch
144​
145​ output = check.export_TAP(results, checkname='depcheck')
133 else: 146​ else:
134 output = json.dumps(run_result, indent=4, separators=(',', ': ')) 147​ output = json.dumps(run_result, indent=4, separators=(',', ': '))
135 148​
136 return output 149​ return output