From ab0b27385ddcd63e5f1bf7955c85998b5338998f Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 28 Jun 2017 18:50:52 -0400 Subject: [PATCH] Default slack to newest plugin config format Change-Id: I2685190d08cf8f7b02ffbe5c1b26ec1d3ed40074 Signed-off-by: Thanh Ha --- jenkins_jobs/modules/publishers.py | 5 ++++- tests/publishers/fixtures/slack001.plugins_info.yaml | 3 +++ tests/publishers/fixtures/slack002.plugins_info.yaml | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 tests/publishers/fixtures/slack001.plugins_info.yaml create mode 100644 tests/publishers/fixtures/slack002.plugins_info.yaml diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index b730e7a07..8fcab9587 100644 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -27,6 +27,7 @@ the build is complete. import logging import pkg_resources +import sys import xml.etree.ElementTree as XML import six @@ -6480,7 +6481,9 @@ def slack(registry, xml_parent, data): logger = logging.getLogger(__name__) plugin_info = registry.get_plugin_info('Slack Notification Plugin') - plugin_ver = pkg_resources.parse_version(plugin_info.get('version', "0")) + # Note: Assume latest version of plugin is preferred config format + plugin_ver = pkg_resources.parse_version( + plugin_info.get('version', str(sys.maxsize))) mapping = ( ('team-domain', 'teamDomain', ''), diff --git a/tests/publishers/fixtures/slack001.plugins_info.yaml b/tests/publishers/fixtures/slack001.plugins_info.yaml new file mode 100644 index 000000000..f2978c3bf --- /dev/null +++ b/tests/publishers/fixtures/slack001.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Slack Notification Plugin' + shortName: 'slack' + version: "1.0" diff --git a/tests/publishers/fixtures/slack002.plugins_info.yaml b/tests/publishers/fixtures/slack002.plugins_info.yaml new file mode 100644 index 000000000..f2978c3bf --- /dev/null +++ b/tests/publishers/fixtures/slack002.plugins_info.yaml @@ -0,0 +1,3 @@ +- longName: 'Slack Notification Plugin' + shortName: 'slack' + version: "1.0"