jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "Update valgrind to use convert_mapping_to_xml()"

Browse Source
This commit is contained in:
Zuul 2017-10-27 04:25:10 +00:00 committed by Gerrit Code Review
commit 572150f0ea
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jenkins_jobs/modules/publishers.py
View File

@ -5062,21 +5062,26 @@ def valgrind(registry, xml_parent, data):
for threshold in ['unstable', 'failed']:
dthreshold = dthresholds.get(threshold, {})
threshold = threshold.replace('failed', 'fail')
XML.SubElement(p, '%sThresholdInvalidReadWrite' % threshold).text \
= str(dthreshold.get('invalid-read-write', ''))
XML.SubElement(p, '%sThresholdDefinitelyLost' % threshold).text \
= str(dthreshold.get('definitely-lost', ''))
XML.SubElement(p, '%sThresholdTotal' % threshold).text \
= str(dthreshold.get('total', ''))
XML.SubElement(p, 'failBuildOnMissingReports').text = str(
data.get('fail-no-reports', False)).lower()
XML.SubElement(p, 'failBuildOnInvalidReports').text = str(
data.get('fail-invalid-reports', False)).lower()
XML.SubElement(p, 'publishResultsForAbortedBuilds').text = str(
data.get('publish-if-aborted', False)).lower()
XML.SubElement(p, 'publishResultsForFailedBuilds').text = str(
data.get('publish-if-failed', False)).lower()
ThresholdInvalidReadWrite = '%sThresholdInvalidReadWrite' % threshold
ThresholdDefinitelyLost = '%sThresholdDefinitelyLost' % threshold
ThresholdTotal = '%sThresholdTotal' % threshold
threshold_mapping = [
('invalid-read-write', ThresholdInvalidReadWrite, ''),
('definitely-lost', ThresholdDefinitelyLost, ''),
('total', ThresholdTotal, ''),
]
helpers.convert_mapping_to_xml(
p, dthreshold, threshold_mapping, fail_required=True)
mapping = [
('fail-no-reports', 'failBuildOnMissingReports', False),
('fail-invalid-reports', 'failBuildOnInvalidReports', False),
('publish-if-aborted', 'publishResultsForAbortedBuilds', False),
('publish-if-failed', 'publishResultsForFailedBuilds', False),
]
helpers.convert_mapping_to_xml(p, data, mapping, fail_required=True)
def pmd(registry, xml_parent, data):