From e1058a2b5cb1773314f09c023ee6aad0248e4d28 Mon Sep 17 00:00:00 2001 From: Yolande Amate Date: Sat, 8 Jul 2017 04:08:30 +0100 Subject: [PATCH] Update class Workflow to use convert_xml() Change-Id: I54f45afd3b5218ad6ed7103400458ebfc8135067 --- jenkins_jobs/modules/project_workflow.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/jenkins_jobs/modules/project_workflow.py b/jenkins_jobs/modules/project_workflow.py index d0a99fa10..8876aba12 100644 --- a/jenkins_jobs/modules/project_workflow.py +++ b/jenkins_jobs/modules/project_workflow.py @@ -50,8 +50,8 @@ Job template example: import logging import xml.etree.ElementTree as XML -from jenkins_jobs.errors import MissingAttributeError import jenkins_jobs.modules.base +from jenkins_jobs.modules.helpers import convert_mapping_to_xml class Workflow(jenkins_jobs.modules.base.Base): @@ -69,13 +69,10 @@ class Workflow(jenkins_jobs.modules.base.Base): {'plugin': 'workflow-cps', 'class': 'org.jenkinsci.plugins.' 'workflow.cps.CpsFlowDefinition'}) - try: - XML.SubElement(xml_definition, 'script').text = data['dsl'] - except KeyError as e: - raise MissingAttributeError(e.args[0]) - - needs_workspace = data.get('sandbox', False) - XML.SubElement(xml_definition, 'sandbox').text = str( - needs_workspace).lower() + mapping = [ + ('dsl', 'script', None), + ('sandbox', 'sandbox', False)] + convert_mapping_to_xml(xml_definition, + data, mapping, fail_required=True) return xml_parent