Merge "Improve support for rvm plugin"

This commit is contained in:
Zuul 2018-06-19 16:30:34 +00:00 committed by Gerrit Code Review
commit c169c00de6
1 changed files with 8 additions and 0 deletions

View File

@ -683,6 +683,14 @@ def rvm_env(registry, xml_parent, data):
'ruby-proxy-object')
ro_class = "Jenkins::Plugin::Proxies::BuildWrapper"
plugin_info = registry.get_plugin_info("RVM Plugin")
plugin_ver = pkg_resources.parse_version(
plugin_info.get("version", str(sys.maxsize)))
if plugin_ver >= pkg_resources.parse_version("0.5"):
ro_class = "Jenkins::Tasks::BuildWrapperProxy"
ro = XML.SubElement(rpo,
'ruby-object',
{'ruby-class': ro_class,