diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-28 09:14:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-28 09:14:00 +0000 |
| commit | e12b2fd20994a410f651836ae1b69b8e706f123e (patch) | |
| tree | 5ab5ba1ad8e7b6c06d869e3ca3e87751bc201a5c /jenkins_jobs | |
| parent | f97acb632a508c9f572894da3de7c338019accbd (diff) | |
| parent | 1cbe42eb9d4b95912ed3f7c6b8dd14f52828ecb9 (diff) | |
| download | python-jenkins-job-builder-e12b2fd20994a410f651836ae1b69b8e706f123e.tar.gz python-jenkins-job-builder-e12b2fd20994a410f651836ae1b69b8e706f123e.tar.xz python-jenkins-job-builder-e12b2fd20994a410f651836ae1b69b8e706f123e.zip | |
Merge "Update dynamic_scriptler_param_common to use convert_xml()"
Diffstat (limited to 'jenkins_jobs')
| -rw-r--r-- | jenkins_jobs/modules/parameters.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/jenkins_jobs/modules/parameters.py b/jenkins_jobs/modules/parameters.py index 47bd5d5b..109a46a4 100644 --- a/jenkins_jobs/modules/parameters.py +++ b/jenkins_jobs/modules/parameters.py @@ -679,23 +679,27 @@ def dynamic_scriptler_param_common(registry, xml_parent, data, ptype): pdef = base_param(registry, xml_parent, data, False, 'com.seitenbau.jenkins.plugins.dynamicparameter.' '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') parameters = data.get('parameters', []) if parameters: + mapping = [ + ('name', 'name', None), + ('value', 'value', None), + ] for parameter in parameters: parameterXML = XML.SubElement(parametersXML, 'com.seitenbau.jenkins.plugins.' 'dynamicparameter.scriptler.' 'ScriptlerParameterDefinition_' '-ScriptParameter') - XML.SubElement(parameterXML, 'name').text = parameter['name'] - XML.SubElement(parameterXML, 'value').text = parameter['value'] - XML.SubElement(pdef, 'readonlyInputField').text = str(data.get( - 'read-only', False)).lower() + convert_mapping_to_xml( + parameterXML, parameter, mapping, fail_required=True) + mapping = [ + ('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): |