From 0e353ddc7d30ba55db3496a6ea5fe0cebbb9e594 Mon Sep 17 00:00:00 2001 From: Yolande Amate Date: Sat, 8 Jul 2017 03:52:15 +0100 Subject: [PATCH] Update class Flow to use convert_mapping_to_xml() Change-Id: I44bb53078f339d380010b1a1a53b940def9f7b82 Signed-off-by: Thanh Ha --- jenkins_jobs/modules/project_flow.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jenkins_jobs/modules/project_flow.py b/jenkins_jobs/modules/project_flow.py index 1ba637912..d9bb4e2ea 100644 --- a/jenkins_jobs/modules/project_flow.py +++ b/jenkins_jobs/modules/project_flow.py @@ -52,6 +52,7 @@ Job example runninng a DSL file from the workspace: import xml.etree.ElementTree as XML import jenkins_jobs.modules.base +from jenkins_jobs.modules.helpers import convert_mapping_to_xml class Flow(jenkins_jobs.modules.base.Base): @@ -59,15 +60,13 @@ class Flow(jenkins_jobs.modules.base.Base): def root_xml(self, data): xml_parent = XML.Element('com.cloudbees.plugins.flow.BuildFlow') - if 'dsl' in data: - XML.SubElement(xml_parent, 'dsl').text = data['dsl'] - else: - XML.SubElement(xml_parent, 'dsl').text = '' needs_workspace = data.get('needs-workspace', False) - XML.SubElement(xml_parent, 'buildNeedsWorkspace').text = str( - needs_workspace).lower() - + mapping = [ + ('dsl', 'dsl', ''), + ('needs-workspace', 'buildNeedsWorkspace', False), + ] + convert_mapping_to_xml(xml_parent, data, mapping, fail_required=True) if needs_workspace and 'dsl-file' in data: XML.SubElement(xml_parent, 'dslFile').text = data['dsl-file']