From fcd7c80252feb828def17af84bc84c409e67a74a Mon Sep 17 00:00:00 2001 From: Kien Ha Date: Tue, 9 Aug 2016 20:12:47 -0400 Subject: [PATCH] Update cfp builder to use convert xml - Update helpers.config_file_provider to use convert mapping to xml Change-Id: I35859653b653347049e72c9e1bf09ce9764aaca2 Signed-off-by: Kien Ha --- jenkins_jobs/modules/helpers.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/jenkins_jobs/modules/helpers.py b/jenkins_jobs/modules/helpers.py index 9b9f597c3..88f0ea8ca 100644 --- a/jenkins_jobs/modules/helpers.py +++ b/jenkins_jobs/modules/helpers.py @@ -95,15 +95,12 @@ def config_file_provider_builder(xml_parent, data): for file in files: xml_file = XML.SubElement(xml_files, 'org.jenkinsci.plugins.' 'configfiles.buildwrapper.ManagedFile') - file_id = file.get('file-id') - if file_id is None: - raise JenkinsJobsException("file-id is required for each " - "managed configuration file") - XML.SubElement(xml_file, 'fileId').text = str(file_id) - XML.SubElement(xml_file, 'targetLocation').text = file.get( - 'target', '') - XML.SubElement(xml_file, 'variable').text = file.get( - 'variable', '') + mapping = [ + ('file-id', 'fileId', None), + ('target', 'targetLocation', ''), + ('variable', 'variable', ''), + ] + convert_mapping_to_xml(xml_file, file, mapping, fail_required=True) def config_file_provider_settings(xml_parent, data):