diff options
| author | Zuul <zuul@review.openstack.org> | 2017-10-27 04:25:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-27 04:25:10 +0000 |
| commit | 572150f0ea1ccdfab7f6d94b429f87844d25befc (patch) | |
| tree | 19c953296e94bddc7b55b3a8dc38e39353f61bfd | |
| parent | f9045ed3ca8d81b68321e6fffa38d886b89bb8f5 (diff) | |
| parent | d6dcd318039f5df22441756e506099ff27ee1175 (diff) | |
| download | python-jenkins-job-builder-572150f0ea1ccdfab7f6d94b429f87844d25befc.tar.gz python-jenkins-job-builder-572150f0ea1ccdfab7f6d94b429f87844d25befc.tar.xz python-jenkins-job-builder-572150f0ea1ccdfab7f6d94b429f87844d25befc.zip | |
Merge "Update valgrind to use convert_mapping_to_xml()"
| -rw-r--r-- | jenkins_jobs/modules/publishers.py | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index c7b2ec7b..407674d1 100644 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -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): |