Fix Postbuildscript Plugin Info Lookup

Between version 0.18.1 and 2.0, the longName of postbuildscript changed
from 'Jenkins Post-Build Script Plug-in' to 'Jenkins PostBuildScript
Plugin'. Because of this JJB>1.6.2 currently does not work with previous
usages of the postbuildscript macros, as the lookup never succeeds for
the plugin<2.0.

This change switches the 'get_plugin_info' call to query using the
shortName, which hasn't changed.

Change-Id: I51437a300993ed09c7419bd9fc70afd0e8629119
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
This commit is contained in:
Trevor Bramwell 2018-04-13 09:51:59 -07:00
parent 82f2ab4417
commit 3247ac488c
6 changed files with 6 additions and 6 deletions

View File

@ -3678,7 +3678,7 @@ def postbuildscript(registry, xml_parent, data):
xml_parent,
'org.jenkinsci.plugins.postbuildscript.PostBuildScript')
info = registry.get_plugin_info('Jenkins PostBuildScript Plugin')
info = registry.get_plugin_info('postbuildscript')
# Note: Assume latest version of plugin is preferred config format
version = pkg_resources.parse_version(
info.get('version', str(sys.maxsize)))

View File

@ -1,3 +1,3 @@
- longName: 'Jenkins PostBuildScript Plugin'
- longName: 'Jenkins Post-Build Script Plug-in'
shortName: 'postbuildscript'
version: "1.0"

View File

@ -1,3 +1,3 @@
- longName: 'Jenkins PostBuildScript Plugin'
- longName: 'Jenkins Post-Build Script Plug-in'
shortName: 'postbuildscript'
version: "1.0"

View File

@ -1,3 +1,3 @@
- longName: 'Jenkins PostBuildScript Plugin'
- longName: 'Jenkins Post-Build Script Plug-in'
shortName: 'postbuildscript'
version: "1.0"

View File

@ -1,3 +1,3 @@
- longName: 'Jenkins PostBuildScript Plugin'
- longName: 'Jenkins Post-Build Script Plug-in'
shortName: 'postbuildscript'
version: "1.0"

View File

@ -1,3 +1,3 @@
- longName: 'Jenkins PostBuildScript Plugin'
- longName: 'Jenkins Post-Build Script Plug-in'
shortName: 'postbuildscript'
version: "1.0"