jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Update dynamic_scriptler_param_common to use convert_xml()"

This commit is contained in:
Zuul 2018-02-28 09:14:00 +00:00 committed by Gerrit Code Review
parent f97acb632a 1cbe42eb9d
commit e12b2fd209
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jenkins_jobs/modules/parameters.py
View File

@ -679,23 +679,27 @@ def dynamic_scriptler_param_common(registry, xml_parent, data, ptype):
pdef = base_param(registry, xml_parent, data, False, pdef = base_param(registry, xml_parent, data, False,
'com.seitenbau.jenkins.plugins.dynamicparameter.' 'com.seitenbau.jenkins.plugins.dynamicparameter.'
'scriptler.' + ptype) 'scriptler.' + ptype)
XML.SubElement(pdef, '__remote').text = str(
data.get('remote', False)).lower()
XML.SubElement(pdef, '__scriptlerScriptId').text = data.get(
'script-id', None)
parametersXML = XML.SubElement(pdef, '__parameters') parametersXML = XML.SubElement(pdef, '__parameters')
parameters = data.get('parameters', []) parameters = data.get('parameters', [])
if parameters: if parameters:
mapping = [
('name', 'name', None),
('value', 'value', None),
]
for parameter in parameters: for parameter in parameters:
parameterXML = XML.SubElement(parametersXML, parameterXML = XML.SubElement(parametersXML,
'com.seitenbau.jenkins.plugins.' 'com.seitenbau.jenkins.plugins.'
'dynamicparameter.scriptler.' 'dynamicparameter.scriptler.'
'ScriptlerParameterDefinition_' 'ScriptlerParameterDefinition_'
'-ScriptParameter') '-ScriptParameter')
XML.SubElement(parameterXML, 'name').text = parameter['name'] convert_mapping_to_xml(
XML.SubElement(parameterXML, 'value').text = parameter['value'] parameterXML, parameter, mapping, fail_required=True)
XML.SubElement(pdef, 'readonlyInputField').text = str(data.get( mapping = [
'read-only', False)).lower() ('script-id', '__scriptlerScriptId', None),
('remote', '__remote', False),
('read-only', 'readonlyInputField', False),
]
convert_mapping_to_xml(pdef, data, mapping, fail_required=True)
def matrix_combinations_param(registry, xml_parent, data): def matrix_combinations_param(registry, xml_parent, data):