From db05e4041d0410649f0e8ceab03a462cdb961deb Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 28 Jun 2017 00:38:11 -0400
Subject: [PATCH] Default conditional-publisher to newest plugin format

Change-Id: I09497fdb6b4906c82d33d9b7b67d79beb110628a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jenkins_jobs/modules/publishers.py                     | 10 ++++++----
 .../conditional-publisher001.plugins_info.yaml         |  3 +++
 .../conditional-publisher002.plugins_info.yaml         |  3 +++
 .../conditional-publisher004.plugins_info.yaml         |  3 +++
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 tests/publishers/fixtures/conditional-publisher001.plugins_info.yaml
 create mode 100644 tests/publishers/fixtures/conditional-publisher002.plugins_info.yaml
 create mode 100644 tests/publishers/fixtures/conditional-publisher004.plugins_info.yaml

diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index b730e7a07..b5587c46f 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
@@ -5590,10 +5591,11 @@ def conditional_publisher(registry, xml_parent, data):
 
             action_parent = cond_publisher
 
-            plugin_info = \
-                registry.get_plugin_info("Flexible Publish Plugin")
-            version = pkg_resources.parse_version(plugin_info.get('version',
-                                                                  '0'))
+            plugin_info = registry.get_plugin_info("Flexible Publish Plugin")
+            # Note: Assume latest version of plugin is preferred config format
+            version = pkg_resources.parse_version(
+                plugin_info.get('version', str(sys.maxsize)))
+
             # XML tag changed from publisher to publisherList in v0.13
             # check the plugin version to determine further operations
             use_publisher_list = version >= pkg_resources.parse_version("0.13")
diff --git a/tests/publishers/fixtures/conditional-publisher001.plugins_info.yaml b/tests/publishers/fixtures/conditional-publisher001.plugins_info.yaml
new file mode 100644
index 000000000..3ca9c3fd6
--- /dev/null
+++ b/tests/publishers/fixtures/conditional-publisher001.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Flexible Publish Plugin'
+  shortName: 'flexible-publish'
+  version: "0.1"
diff --git a/tests/publishers/fixtures/conditional-publisher002.plugins_info.yaml b/tests/publishers/fixtures/conditional-publisher002.plugins_info.yaml
new file mode 100644
index 000000000..3ca9c3fd6
--- /dev/null
+++ b/tests/publishers/fixtures/conditional-publisher002.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Flexible Publish Plugin'
+  shortName: 'flexible-publish'
+  version: "0.1"
diff --git a/tests/publishers/fixtures/conditional-publisher004.plugins_info.yaml b/tests/publishers/fixtures/conditional-publisher004.plugins_info.yaml
new file mode 100644
index 000000000..3ca9c3fd6
--- /dev/null
+++ b/tests/publishers/fixtures/conditional-publisher004.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Flexible Publish Plugin'
+  shortName: 'flexible-publish'
+  version: "0.1"