jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "rbenv: Utilize convert_mapping_to_xml"

This commit is contained in:
Zuul 2018-08-31 23:38:28 +00:00 committed by Gerrit Code Review
parent 6f5a787b45 2f693aa4d5
commit 060542a3fe
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jenkins_jobs/modules/wrappers.py
View File

@ -770,19 +770,6 @@ def rbenv(registry, xml_parent, data):
.. literalinclude:: /../../tests/wrappers/fixtures/rbenv003.yaml
"""
mapping = [
# option, xml name, default value (text), attributes (hard coded)
("preinstall-gem-list", 'gem__list', 'bundler,rake'),
("rbenv-root", 'rbenv__root', '$HOME/.rbenv'),
("rbenv-repo", 'rbenv__repository',
'https://github.com/rbenv/rbenv'),
("rbenv-branch", 'rbenv__revision', 'master'),
("ruby-build-repo", 'ruby__build__repository',
'https://github.com/rbenv/ruby-build'),
("ruby-build-branch", 'ruby__build__revision', 'master'),
("ruby-version", 'version', '1.9.3-p484'),
]
rpo = XML.SubElement(xml_parent,
'ruby-proxy-object')
@ -802,18 +789,25 @@ def rbenv(registry, xml_parent, data):
{'ruby-class': 'RbenvWrapper',
'pluginid': 'rbenv'})
mapping = [
# option, xml name, default value (text), attributes (hard coded)
("preinstall-gem-list", 'gem__list', 'bundler,rake'),
("rbenv-root", 'rbenv__root', '$HOME/.rbenv'),
("rbenv-repo", 'rbenv__repository',
'https://github.com/rbenv/rbenv'),
("rbenv-branch", 'rbenv__revision', 'master'),
("ruby-build-repo", 'ruby__build__repository',
'https://github.com/rbenv/ruby-build'),
("ruby-build-branch", 'ruby__build__revision', 'master'),
("ruby-version", 'version', '1.9.3-p484'),
]
helpers.convert_mapping_to_xml(o, data, mapping, fail_required=False)
for elem in mapping:
(optname, xmlname, val) = elem[:3]
xe = XML.SubElement(o,
xmlname,
{'ruby-class': "String",
'pluginid': "rbenv"})
if optname and optname in data:
val = data[optname]
if type(val) == bool:
xe.text = str(val).lower()
else:
xe.text = val
elem_tag = o.find(xmlname)
elem_tag.set("ruby-class", "String")
elem_tag.set("pluginid", "rbenv")
ignore_local_class = 'FalseClass'