From 47ab1173e03e4715b748e56ccfdbadfd92fdfe72 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 28 Jun 2017 19:04:05 -0400
Subject: [PATCH] Default artifactory-generic to newest plugin config format

Change-Id: I3a1f6185a0a71bb1444ba3e45790ecfce559e9f5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jenkins_jobs/modules/wrappers.py                         | 5 ++++-
 tests/wrappers/fixtures/artifactory002.plugins_info.yaml | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 tests/wrappers/fixtures/artifactory002.plugins_info.yaml

diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py
index 97f8ed3da..ba654d211 100644
--- a/jenkins_jobs/modules/wrappers.py
+++ b/jenkins_jobs/modules/wrappers.py
@@ -24,6 +24,7 @@ Wrappers can alter the way the build is run as well as the build output.
 
 import logging
 import pkg_resources
+import sys
 import xml.etree.ElementTree as XML
 
 from jenkins_jobs.errors import InvalidAttributeError
@@ -2124,7 +2125,9 @@ def artifactory_generic(registry, xml_parent, data):
 
     # Get plugin information to maintain backwards compatibility
     info = registry.get_plugin_info('artifactory')
-    version = pkg_resources.parse_version(info.get('version', '0'))
+    # Note: Assume latest version of plugin is preferred config format
+    version = pkg_resources.parse_version(
+        info.get('version', str(sys.maxsize)))
 
     if version >= pkg_resources.parse_version('2.3.0'):
         deployReleaseRepo = XML.SubElement(details, 'deployReleaseRepository')
diff --git a/tests/wrappers/fixtures/artifactory002.plugins_info.yaml b/tests/wrappers/fixtures/artifactory002.plugins_info.yaml
new file mode 100644
index 000000000..d49108b67
--- /dev/null
+++ b/tests/wrappers/fixtures/artifactory002.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Jenkins Artifactory Plugin'
+  shortName: 'artifactory'
+  version: "0"