From 3247ac488ca32b828f527e873aac5c7e008fc181 Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Fri, 13 Apr 2018 09:51:59 -0700 Subject: [PATCH] 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 --- jenkins_jobs/modules/publishers.py | 2 +- tests/publishers/fixtures/postbuildscript000.plugins_info.yaml | 2 +- tests/publishers/fixtures/postbuildscript001.plugins_info.yaml | 2 +- tests/publishers/fixtures/postbuildscript002.plugins_info.yaml | 2 +- tests/publishers/fixtures/postbuildscript003.plugins_info.yaml | 2 +- tests/publishers/fixtures/postbuildscript004.plugins_info.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index 1e29452ab..f6554745f 100644 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -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))) diff --git a/tests/publishers/fixtures/postbuildscript000.plugins_info.yaml b/tests/publishers/fixtures/postbuildscript000.plugins_info.yaml index 68edff69d..7bad4f7a0 100644 --- a/tests/publishers/fixtures/postbuildscript000.plugins_info.yaml +++ b/tests/publishers/fixtures/postbuildscript000.plugins_info.yaml @@ -1,3 +1,3 @@ -- longName: 'Jenkins PostBuildScript Plugin' +- longName: 'Jenkins Post-Build Script Plug-in' shortName: 'postbuildscript' version: "1.0" diff --git a/tests/publishers/fixtures/postbuildscript001.plugins_info.yaml b/tests/publishers/fixtures/postbuildscript001.plugins_info.yaml index 68edff69d..7bad4f7a0 100644 --- a/tests/publishers/fixtures/postbuildscript001.plugins_info.yaml +++ b/tests/publishers/fixtures/postbuildscript001.plugins_info.yaml @@ -1,3 +1,3 @@ -- longName: 'Jenkins PostBuildScript Plugin' +- longName: 'Jenkins Post-Build Script Plug-in' shortName: 'postbuildscript' version: "1.0" diff --git a/tests/publishers/fixtures/postbuildscript002.plugins_info.yaml b/tests/publishers/fixtures/postbuildscript002.plugins_info.yaml index 68edff69d..7bad4f7a0 100644 --- a/tests/publishers/fixtures/postbuildscript002.plugins_info.yaml +++ b/tests/publishers/fixtures/postbuildscript002.plugins_info.yaml @@ -1,3 +1,3 @@ -- longName: 'Jenkins PostBuildScript Plugin' +- longName: 'Jenkins Post-Build Script Plug-in' shortName: 'postbuildscript' version: "1.0" diff --git a/tests/publishers/fixtures/postbuildscript003.plugins_info.yaml b/tests/publishers/fixtures/postbuildscript003.plugins_info.yaml index 68edff69d..7bad4f7a0 100644 --- a/tests/publishers/fixtures/postbuildscript003.plugins_info.yaml +++ b/tests/publishers/fixtures/postbuildscript003.plugins_info.yaml @@ -1,3 +1,3 @@ -- longName: 'Jenkins PostBuildScript Plugin' +- longName: 'Jenkins Post-Build Script Plug-in' shortName: 'postbuildscript' version: "1.0" diff --git a/tests/publishers/fixtures/postbuildscript004.plugins_info.yaml b/tests/publishers/fixtures/postbuildscript004.plugins_info.yaml index 68edff69d..7bad4f7a0 100644 --- a/tests/publishers/fixtures/postbuildscript004.plugins_info.yaml +++ b/tests/publishers/fixtures/postbuildscript004.plugins_info.yaml @@ -1,3 +1,3 @@ -- longName: 'Jenkins PostBuildScript Plugin' +- longName: 'Jenkins Post-Build Script Plug-in' shortName: 'postbuildscript' version: "1.0"